Change

AddSkillDetails.py

@@ -1,8 +1,8 @@
-import psycopg2
-from psycopg2 import sql
 
+from psycopg2 import sql
+from DbConnection import DbConnection
 class AddSkill:
-    def AddSkillDetails(db_params, skills):
+    def AddSkillDetails(skills):
         returnMsg=''
         details = skills.split(',')
         skill_details = details[0]
@@ -10,7 +10,7 @@ class AddSkill:
         skill_score1 = details[2]
         weightage = -2
         is_active = True
-        conn = psycopg2.connect(**db_params)
+        conn = DbConnection.GetMySQLDbConnection()
         cursor = conn.cursor()
         print("Adding Skill " + skill_details)
         query = "SELECT skillid FROM skillmaster WHERE upper(skillDetails) IN (%s)"

OpenAIResponse.py

@@ -1,24 +0,0 @@
-from openai import OpenAI
-class OpenAIText:
-    def OpenAITextResponse(query:str, content:str):
-        client = OpenAI(api_key='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')
-
-        response = client.chat.completions.create(
-        model="gpt-3.5-turbo",
-        messages=[
-            {
-            "role": "system",
-            "content": query
-            },
-            {
-            "role": "user",
-            "content": content
-            }
-        ],
-        temperature=0.7,
-        max_tokens=64,
-        top_p=1
-        )
-        print(response.choices[0].message.content)
-        return response.choices[0].message.content 
-        

RemoveSkills.py

@@ -2,7 +2,7 @@ import psycopg2
 import pymysql
 from DbConnection import DbConnection
 class RemoveSkill:
-    def RemoveSkillDetails(db_params, SkillName):
+    def RemoveSkillDetails(SkillName):
         #conn = psycopg2.connect(**db_params)
         conn1 = DbConnection.GetMySQLDbConnection()
         cursor = conn1.cursor()          

SkillExtractV1.py

@@ -2,11 +2,12 @@ import re
 from datetime import datetime
 import psycopg2
 import pandas as pd
+from DbConnection import DbConnection
 class SkillExtractorDetailsV1:
 
 
-    def GetSkillData(skill_extractor, inputData, db_params):
-        getdbskills = SkillExtractorDetailsV1.GetSkillDatafromDB(db_params)
+    def GetSkillData(skill_extractor, inputData):
+        getdbskills = SkillExtractorDetailsV1.GetSkillDatafromDB()
         
         skills_list = []
         annotations = skill_extractor.annotate(inputData)
@@ -43,7 +44,7 @@ class SkillExtractorDetailsV1:
         # list_of_tuples = list(zip(skills_list, skill_Typelst,skill_Scorelst))        
         # df = pd.DataFrame(list_of_tuples,
         #           columns=['Skill_Name', 'Skill_Type','Skill_Score'])
-        newSkilllst = SkillExtractorDetailsV1.extractWords(inputData, db_params)
+        newSkilllst = SkillExtractorDetailsV1.extractWords(inputData)
         reqSkill = ''
         if(len(newSkilllst)>0):
             reqSkill = ','.join(reuiredSkilllst) + ','  + ','.join(newSkilllst)
@@ -55,19 +56,19 @@ class SkillExtractorDetailsV1:
         
         return df        
 
-    def GetSkillDatafromDB(db_params):
-        conn = psycopg2.connect(**db_params)
+    def GetSkillDatafromDB():
+        conn = DbConnection.GetMySQLDbConnection()
         
         query = "select upper(skilldetails) skill from skillmaster where weightage = 0"
         df = pd.read_sql_query(query, conn)
         return df
     
-    def extractWords(job_description,db_params):
+    def extractWords(job_description):
         job_roles = []
         job_description = job_description.replace(')',' ')
         delimiters = ",", " ", " , ", ";","\n","/","\\"
         regex_pattern = '|'.join(map(re.escape, delimiters))
-        df = SkillExtractorDetailsV1.getNewSkills(db_params)
+        df = SkillExtractorDetailsV1.getNewSkills()
         data = re.split(regex_pattern, job_description)
         #data = job_description.split(',')
         for ds in data:
@@ -81,9 +82,9 @@ class SkillExtractorDetailsV1:
                 test = 1
         return job_roles 
 
-    def getNewSkills(db_params):
+    def getNewSkills():
         query = "select skillid,skilldetails,skilltype,skill_score from skillmaster where weightage = -2"
-        conn = psycopg2.connect(**db_params)
+        conn = DbConnection.GetMySQLDbConnection()
         cursor = conn.cursor()
         df_skill_master = pd.read_sql_query(query, conn)
         df_skill_master['skilldetails'] = df_skill_master['skilldetails'].str.upper()

app.py

@@ -27,7 +27,6 @@ from ExtractContentsFromFile import ExtractContentFromFile
 from RemoveSkills import RemoveSkill
 from AddSkillDetails import AddSkill
 from SkillMatcher import SkillMatch
-from OpenAIResponse import OpenAIText
 from SkillExtractV1 import SkillExtractorDetailsV1
 import ClassModals
 import os
@@ -54,19 +53,19 @@ def parse_csv(df):
 @app.post("/UploadJobDescription/")
 def UploadJobDescription(file: bytes =  File(...), FileName: str = "sample.pdf"):   
     text= ExtractContentFromFile.ExtractDataFromFile(FileName,file)
-    returnSkills = SkillExtractorDetailsV1.GetSkillData(skill_extractor,text,db_params)     
+    returnSkills = SkillExtractorDetailsV1.GetSkillData(skill_extractor,text)     
     return parse_csv(returnSkills) 
 
 
 @app.delete("/RemoveSkillsByName/")
 def RemoveSkills(SkillName : str):    
-    RemoveSkill.RemoveSkillDetails(db_params,SkillName)
+    RemoveSkill.RemoveSkillDetails(SkillName)
     return "Skill Removed Successfully"
 
 @app.post("/AddSkillDeails/")
 def AddSkills(Skills : ClassModals.Modals.AddSkillDetails):    
     skilldetailsStr = Skills.SkillName + ',' + Skills.SkillType + ',' + str(Skills.SkillScore)    
-    return AddSkill.AddSkillDetails(db_params,skilldetailsStr)
+    return AddSkill.AddSkillDetails(skilldetailsStr)
 
 #return JSONResponse(content={"message": "Here's your interdimensional portal." , "mes1":"data2"})
 #https://vaibhav84-resumeapi.hf.space/docs