ws-bom-robot-app 0.0.34__tar.gz → 0.0.35__tar.gz

{ws_bom_robot_app-0.0.34/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.34
+Version: 0.0.35
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa

{ws_bom_robot_app-0.0.34 → ws_bom_robot_app-0.0.35}/setup.py

@@ -4,7 +4,7 @@ _requirements = [line.split('#')[0].strip() for line in open("requirements.txt")
 
 setup(
     name="ws_bom_robot_app",
-    version="0.0.34",
+    version="0.0.35",
     description="A FastAPI application serving ws bom/robot/llm platform ai.",
     long_description=open("README.md", encoding='utf-8').read(),
     long_description_content_type="text/markdown",

{ws_bom_robot_app-0.0.34 → ws_bom_robot_app-0.0.35}/ws_bom_robot_app/config.py

@@ -25,7 +25,7 @@ class Settings(BaseSettings):
     robot_debugger_llm_key: str = ''
     robot_debugger_embedding_key: str = ''
     OPENAI_API_KEY: str = '' # used for dall-e api
-    GOOGLE_APPLICATION_CREDENTIALS: str = './.data/credentials/google.json' # path to google credentials iam file
+    GOOGLE_APPLICATION_CREDENTIALS: str = './.secrets/google.json' # path to google credentials iam file
     model_config = ConfigDict(
         env_file='./.env',
         extra='ignore',

ws_bom_robot_app-0.0.35/ws_bom_robot_app/llm/utils/secrets.py

@@ -0,0 +1,26 @@
+import json, os, logging
+from typing import Union
+class Secrets:
+  @staticmethod
+  def from_file(path: str) -> dict[str, Union[str, int, list]] | None:
+    if os.path.exists(path):
+      with open(path, 'r') as file:
+        _content = file.read()
+        try:
+          return json.loads(_content)
+        except json.JSONDecodeError:
+          logging.error(f"Failed to parse secret file: {path}")
+    else:
+      logging.error(f"Secret file not found: {path}")
+    return None
+  @staticmethod
+  def from_env(key: str) -> dict[str, Union[str, int, list]] | None:
+    _content = os.getenv(key)
+    if _content:
+      try:
+        return json.loads(_content)
+      except json.JSONDecodeError:
+        logging.error(f"Failed to parse environment variable: {key}")
+    else:
+      logging.error(f"Environment variable not found: {key}")
+    return None

{ws_bom_robot_app-0.0.34 → ws_bom_robot_app-0.0.35}/ws_bom_robot_app/llm/vector_store/integration/base.py

@@ -4,11 +4,22 @@ from abc import ABC, abstractmethod
 from unstructured_ingest.v2.interfaces import ProcessorConfig
 from unstructured_ingest.v2.pipeline.pipeline import Pipeline, PartitionerConfig, FiltererConfig
 from typing import Union
+from ws_bom_robot_app.llm.utils.secrets import Secrets
 
 class IntegrationStrategy(ABC):
+  @classmethod
+  def _parse_data(cls, data: dict[str, Union[str, int, list]]) -> dict[str, Union[str, int, list]]:
+    for key, fn in (
+      ("__from_env", Secrets.from_env),
+      ("__from_file", Secrets.from_file),
+    ):
+      if key in data:
+        if secret := fn(data[key]):
+          return secret
+    return data
   def __init__(self, knowledgebase_path: str, data: dict[str, Union[str,int,list]]):
     self.knowledgebase_path = knowledgebase_path
-    self.data = data
+    self.data = self._parse_data(data)
     self.working_directory = os.path.join(self.knowledgebase_path,self.working_subdirectory())
     os.makedirs(self.working_directory, exist_ok=True)
   @property

{ws_bom_robot_app-0.0.34 → ws_bom_robot_app-0.0.35/ws_bom_robot_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.34
+Version: 0.0.35
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa

{ws_bom_robot_app-0.0.34 → ws_bom_robot_app-0.0.35}/ws_bom_robot_app.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ ws_bom_robot_app/llm/utils/chunker.py
 ws_bom_robot_app/llm/utils/download.py
 ws_bom_robot_app/llm/utils/kb.py
 ws_bom_robot_app/llm/utils/print.py
+ws_bom_robot_app/llm/utils/secrets.py
 ws_bom_robot_app/llm/utils/webhooks.py
 ws_bom_robot_app/llm/vector_store/__init__.py
 ws_bom_robot_app/llm/vector_store/generator.py