Vaibhav84 commited on
Commit
163e27f
·
1 Parent(s): 73e3c95
Files changed (3) hide show
  1. SkillExtract.py +1 -36
  2. SkillExtractV1.py +13 -2
  3. app.py +1 -1
SkillExtract.py CHANGED
@@ -145,42 +145,7 @@ class SkillExtractorDetails:
145
  params = (skill_name,) # Replace 'Test' with your actual variable or user input
146
  cursor.execute(query, params)
147
  if cursor.rowcount > 0:
148
- print("Skill Identified : ", skill_name)
149
- result = cursor.fetchall()
150
- for row in result:
151
- row_as_int = [int(element) for element in row]
152
- #print("Skill Already in SkillMaster")
153
- OldSkillCount = OldSkillCount + 1
154
- isOld = "Yes"
155
- if(IsJD):
156
- query = "SELECT skillid FROM jdSkilldetails WHERE skillid IN (%s) and jdMasterid in (%s)"
157
- else:
158
- query = "SELECT skillid FROM CourseSkilldetails WHERE skillid IN (%s) and Masterid in (%s)"
159
- params = (row_as_int[0],id_value,)
160
- cursor.execute(query, params)
161
- if cursor.rowcount > 0:
162
- weightage = -1.0
163
- #print("Skill Already in SkillMaster and JDSkillDetails")
164
- else:
165
- if(IsJD):
166
- Skillid = row_as_int[0]
167
- jdMasterid = id_value
168
- insert_query = sql.SQL("""INSERT INTO jdSkilldetails (Skillid, jdMasterid) VALUES (%s, %s)""")
169
- cursor.execute(insert_query, (Skillid, jdMasterid))
170
- conn.commit()
171
- else:
172
- query = "Select max(skilldetailsid) from courseskilldetails"
173
- df = pd.read_sql_query(query, conn)
174
- CourseID = df.iat[0,0] + 1
175
-
176
- Skillid = row_as_int[0]
177
- jdMasterid = id_value
178
- insert_query = sql.SQL("""INSERT INTO Courseskilldetails (skilldetailsid, Skillid, Masterid) VALUES (%s, %s, %s)""")
179
- cursor.execute(insert_query, (CourseID, Skillid, jdMasterid))
180
- conn.commit()
181
-
182
- #print("Skill Already in SkillMaster and Inserted in JDSkillDetails")
183
- #print(row_as_int)
184
  else:
185
  NewSkillCount = NewSkillCount + 1
186
  isOld = "No"
 
145
  params = (skill_name,) # Replace 'Test' with your actual variable or user input
146
  cursor.execute(query, params)
147
  if cursor.rowcount > 0:
148
+ print('Skill in DB')
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
149
  else:
150
  NewSkillCount = NewSkillCount + 1
151
  isOld = "No"
SkillExtractV1.py CHANGED
@@ -1,9 +1,13 @@
1
  import re
2
  from datetime import datetime
 
 
3
  class SkillExtractorDetailsV1:
4
 
5
 
6
- def GetSkillData(skill_extractor, inputData):
 
 
7
  skills_list = []
8
  annotations = skill_extractor.annotate(inputData)
9
  matches = annotations['results']['full_matches']+annotations['results']['ngram_scored']
@@ -22,6 +26,13 @@ class SkillExtractorDetailsV1:
22
 
23
  return skills_list
24
 
 
 
 
25
 
 
 
 
 
26
 
27
-
 
1
  import re
2
  from datetime import datetime
3
+ import psycopg2
4
+ import pandas as pd
5
  class SkillExtractorDetailsV1:
6
 
7
 
8
+ def GetSkillData(skill_extractor, inputData, db_params):
9
+ getdbskills = SkillExtractorDetailsV1.GetSkillDatafromDB(db_params)
10
+ print(getdbskills)
11
  skills_list = []
12
  annotations = skill_extractor.annotate(inputData)
13
  matches = annotations['results']['full_matches']+annotations['results']['ngram_scored']
 
26
 
27
  return skills_list
28
 
29
+ def GetSkillDatafromDB(db_params):
30
+ conn = psycopg2.connect(**db_params)
31
+ cursor_obj = conn.cursor()
32
 
33
+ query = "select skilldetails from skillmaster where weightage = 0"
34
+ cursor_obj.execute(query)
35
+ skill_data = cursor_obj.fetchall()
36
+ return skill_data
37
 
38
+
app.py CHANGED
@@ -65,7 +65,7 @@ def UploadJobDescription(file: bytes = File(...), FileName: str = "sample.pdf")
65
  def UploadJobDescriptionV1(file: bytes = File(...), FileName: str = "sample.pdf"):
66
  text= ExtractContentFromFile.ExtractDataFromFile(FileName,file)
67
  #returnID = UploadOpenFile.uploadFile(text,FileName,db_params,True)
68
- returnSkills = SkillExtractorDetailsV1.GetSkillData(skill_extractor,text)
69
  #details = returnSkills.split('@')
70
  #data = {'Data':['Required Skills', 'Soft Skills', 'Good to have Skills'], 'Values':[details[0], details[1], details[2]]}
71
  #df = pd.DataFrame(data)
 
65
  def UploadJobDescriptionV1(file: bytes = File(...), FileName: str = "sample.pdf"):
66
  text= ExtractContentFromFile.ExtractDataFromFile(FileName,file)
67
  #returnID = UploadOpenFile.uploadFile(text,FileName,db_params,True)
68
+ returnSkills = SkillExtractorDetailsV1.GetSkillData(skill_extractor,text,db_params)
69
  #details = returnSkills.split('@')
70
  #data = {'Data':['Required Skills', 'Soft Skills', 'Good to have Skills'], 'Values':[details[0], details[1], details[2]]}
71
  #df = pd.DataFrame(data)