Changes

SkillExtract.py

@@ -65,15 +65,15 @@ class SkillExtractorDetails:
         job_description = job_description.replace(')',' ')
         delimiters = ",", " ", " , ", ";","\n","/","\\"
         regex_pattern = '|'.join(map(re.escape, delimiters))
-        df = SkillExtractor.getNewSkills(db_params)
+        df = SkillExtractorDetails.SkillExtractor.getNewSkills(db_params)
         data = re.split(regex_pattern, job_description)
         #data = job_description.split(',')
         for ds in data:
             #print(ds)
             try:
-                if(SkillExtractor.skill_Validate(df,ds.strip())):                
+                if(SkillExtractorDetails.SkillExtractor.skill_Validate(df,ds.strip())):                
                     job_roles.append(ds) 
-                    SkillExtractor.GetSkillId(ds.strip(),JdMasterid,db_params)
+                    SkillExtractorDetails.SkillExtractor.GetSkillId(ds.strip(),JdMasterid,db_params)
                     print("Skills Identified* : " + ds)   
             except Exception as error:
                 test = 1
@@ -84,10 +84,10 @@ class SkillExtractorDetails:
         conn = psycopg2.connect(**db_params)
         cursor = conn.cursor()
 
-
+        jd_id = str(JdID)
         # Retrieve "id" and "description" columns from the table
         #query = sql.SQL("select jdmasterid,jobdescription from JDMaster where isskillsextracted in (0)")
-        query = "select jdmasterid,jobdescription,filename from JDMaster where isskillsextracted = 0 and jdmasterid = str(" + JdID + ")"
+        query = "select jdmasterid,jobdescription,filename from JDMaster where isskillsextracted = 0 and jdmasterid = str(" + jd_id + ")"
 
         # Use Pandas to read the data into a DataFrame
         df = pd.read_sql_query(query, conn)
@@ -181,7 +181,7 @@ class SkillExtractorDetails:
                         conn.commit()
                         print("Skill Identified : ", skill_name)
                         #print("Skill inserted in SkillMaster and Inserted in JDSkillDetails")
-            SkillExtractor.extractWords(description_value,id_value,db_params)
+            SkillExtractorDetails.SkillExtractor.extractWords(description_value,id_value,db_params)
             query = "update public.jdmaster set isskillsextracted = 1 where jdmasterid = (%s)"
             
             params = (id_value,)  
@@ -189,7 +189,7 @@ class SkillExtractorDetails:
             conn.commit()
             print("Skills Updated for Skills Extraction for file ", filename_jd)
             print("Total Skills : ", len(skills_list))
-            return SkillExtractor.latestSkillDetails(id_value,db_params)
+            return SkillExtractorDetails.SkillExtractor.latestSkillDetails(id_value,db_params)
     def latestSkillDetails(jid,db_params):
         query = "select * from jdmaster where isskillsextracted=1 order by jdmasterid desc limit 1 "
         conn = psycopg2.connect(**db_params)
@@ -200,14 +200,14 @@ class SkillExtractorDetails:
         upload = df.iat[0,3]
         if(fileId != jid):
             print("Skill Details for File : " + str(filename) + " , ID " + str(fileId) + " , Uploaded on " + str(upload))
-            data = SkillExtractor.display_skills(fileId)
+            data = SkillExtractorDetails.SkillExtractor.display_skills(fileId)
             jid = df.iat[0,0]
         return data
     def tuple_to_int(tup):
         if len(tup) == 1:
             return tup[0]
         else:
-            return tup[0] * (10 ** (len(tup) - 1)) + SkillExtractor.tuple_to_int(tup[1:])
+            return tup[0] * (10 ** (len(tup) - 1)) + SkillExtractorDetails.SkillExtractor.tuple_to_int(tup[1:])
 
 
     def skill_check(dbQuery,db_params):
@@ -225,16 +225,16 @@ class SkillExtractorDetails:
     def display_skills(id):
         jd=str(id)
         query = "select skillname from SkillDetails  where id = "+ jd +" and skillscore > 99 and skilltype = 'Hard Skill'"
-        RequiredSkills_Hard  = SkillExtractor.skill_check(query)
+        RequiredSkills_Hard  = SkillExtractorDetails.SkillExtractor.skill_check(query)
 
         query = "select skillname from SkillDetails  where id = "+ jd +" and skillscore > 50 and skilltype = 'Soft Skill'"  
-        RequiredSkills_Soft  = SkillExtractor.skill_check(query)
+        RequiredSkills_Soft  = SkillExtractorDetails.SkillExtractor.skill_check(query)
 
         query = "select skillname from SkillDetails  where id = "+ jd +" and skillscore < 50 and skilltype = 'Soft Skill'"  
-        RequiredSkills_G1  = SkillExtractor.skill_check(query)
+        RequiredSkills_G1  = SkillExtractorDetails.SkillExtractor.skill_check(query)
 
         query = "select skillname from SkillDetails  where id = "+ jd +" and skillscore < 99 and skilltype = 'Hard Skill'"  
-        RequiredSkills_G2  = SkillExtractor.skill_check(query)
+        RequiredSkills_G2  = SkillExtractorDetails.SkillExtractor.skill_check(query)
 
         print('')
         print("Required Skills      : " + RequiredSkills_Hard)