changes

ClassModals.py

@@ -1,6 +1,17 @@
 from pydantic import BaseModel
-class ClassModals:
+class Modals:
     class AddSkillDetails(BaseModel):    
         SkillName: str = 'SkillName'
         SkillType: str = 'Soft Skill'
-        SkillScore: int = 10   
+        SkillScore: int = 10   
+
+    class FileDetails(BaseModel):
+        filecontents: str
+        filename: str
+        fileid: str
+        message: str
+    class SkillDetails(BaseModel):
+        skillid: int 
+        requiredSkills: str
+        softSkills: str
+        goodToHaveSkills: str          

app.py

@@ -30,26 +30,6 @@ import os
 os.environ['HF_HOME'] = '/hug/cache/'
 
 app = FastAPI()
-class FileDetails(BaseModel):
-    filecontents: str
-    filename: str
-    fileid: str
-    message: str
-
-
-class SkillDetails(BaseModel):
-    skillid: int 
-    requiredSkills: str
-    softSkills: str
-    goodToHaveSkills: str  
-
-class AddSkillDetails1(BaseModel):    
-    SkillName: str = 'SkillName'
-    SkillType: str = 'Soft Skill'
-    SkillScore: int = 10     
-
-class SkillData(BaseModel):
-    filename: str 
          
 nlp = spacy.load("en_core_web_lg")
     # init skill extractor
@@ -84,7 +64,7 @@ def AllProfileMatchResults():
    return parse_csv(df) 
 
 @app.post("/UploadOpenText/")
-def UploadOpenText(file_data: FileDetails):   
+def UploadOpenText(file_data: ClassModals.Modals.FileDetails):   
    
    returnID = UploadOpenFile.uploadFile(file_data.filecontents,file_data.filename,db_params)
    file_data.filecontents = ""
@@ -95,7 +75,7 @@ def UploadOpenText(file_data: FileDetails):
 
 
 @app.post("/ExtractSkillsByJobID/")
-def ExtractSkillsByJobID(skill_data: SkillDetails):
+def ExtractSkillsByJobID(skill_data: ClassModals.Modals.SkillDetails):
    returnSkills = SkillExtractorDetails.SkillExtract(db_params,skill_extractor,skill_data.skillid)     
    details = returnSkills.split('@')
    skill_data.requiredSkills = details[0]
@@ -109,10 +89,9 @@ def RemoveSkills(SkillName : str):
     return "Skill Removed Successfully"
 
 @app.post("/AddSkillDeails/")
-def AddSkills(Skills : ClassModals.ClassModals.AddSkillDetails):    
-    skilldetailsStr = Skills.SkillName + ',' + Skills.SkillType + ',' + str(Skills.SkillScore)
-    AddSkill.AddSkillDetails(db_params,skilldetailsStr)
-    return "Skill Removed Successfully"
+def AddSkills(Skills : ClassModals.Modals.AddSkillDetails):    
+    skilldetailsStr = Skills.SkillName + ',' + Skills.SkillType + ',' + str(Skills.SkillScore)    
+    return AddSkill.AddSkillDetails(db_params,skilldetailsStr)
 
 
 #return JSONResponse(content={"message": "Here's your interdimensional portal." , "mes1":"data2"})