fix(inferer+annotator): fix issues

api/internal_services/annotator.py

@@ -71,6 +71,8 @@ def annotation_process(job):
                             get_last_concept_index(),
                             word_id
                         )
+        case 'NONE':
+            logger.error("No annotator configured, please provide an annotator before trying to add sentences.")
 
 
 def separate_intervals(data):

api/internal_services/database.py

@@ -31,12 +31,13 @@ def update_last_concept_index(value):
 def get_annotator_config():
     result = db.search(where('key') == 'annotator_config')
     if not result:
-        created_object = {'key': 'annotator_config', 'value': { 'provider': 'GPT' }}
+        created_object = {'key': 'annotator_config', 'value': { 'provider': 'NONE' }}
         db.insert(created_object)
-        return 0
+        return created_object['value']
     else:
         return result[0]['value']
 
 def update_annotator_config(value):
+    get_annotator_config()
     db.update({'value': value}, where('key') == 'annotator_config')
     return value
\ No newline at end of file

api/internal_services/gpt.py

 import json
-import os
-import traceback
-
 from openai import OpenAI
+from api.internal_services import database
 from api.internal_services.logger import logger
 
-client = OpenAI()
-
 def gpt_process(sentence):
     try:
+        annotator_config = database.get_annotator_config()
+        client = OpenAI(api_key=annotator_config['openai_key'])
         completion = client.chat.completions.create(
             model="gpt-4",
             messages=[

api/models/InfererConfig.py

@@ -2,5 +2,6 @@ from pydantic import BaseModel
 
 class InfererConfig(BaseModel):
     provider: str
-    model_id: str
-    server_url: str
+    model_id: str | None = None
+    server_url: str | None = None
\ No newline at end of file
+    openai_key: str | None = None
\ No newline at end of file

api/routers/endpoints.py

@@ -40,9 +40,13 @@ def add_sentence_to_process(training_body: TrainingBody):
 
 @router.post("/actions/inferer/config")
 def add_sentence_to_process(infererConfig: InfererConfig):
-    new_config = {'model_id': infererConfig.provider}
-    if infererConfig.provider == 'BERT':
-        new_config['model_id'] = infererConfig.model_id
-        new_config['server_url'] = infererConfig.server_url
+    new_config = {'provider': infererConfig.provider}
 
-    database.update_annotator_config({'model_id': 'GPT'})
+    match infererConfig.provider:
\ No newline at end of file
+        case 'BERT':
+            new_config['model_id'] = infererConfig.model_id
+            new_config['server_url'] = infererConfig.server_url
+        case 'GPT':
+            new_config['openai_key'] = infererConfig.openai_key
+
+    database.update_annotator_config(new_config)
\ No newline at end of file

microservices/inferer/setup.py

 from setuptools import setup, find_packages
 
 setup(
-    name='ALA-Plateform-trainer',
+    name='ALA-Plateform-inferer',
     version='0.1',
     packages=find_packages(),
     install_requires=[