fairo 25.8.2__tar.gz → 25.9.1__tar.gz

{fairo-25.8.2 → fairo-25.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairo
-Version: 25.8.2
+Version: 25.9.1
 Summary: SDK for interfacing with Fairo SaaS platform.
 Author-email: "Fairo Systems, Inc." <support@fairo.ai>
 License: Apache-2.0
@@ -11,14 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: mlflow<=3.2.0,>=3.1.0
+Requires-Dist: mlflow<=3.1.1,>=3.1.0
 Requires-Dist: langchain<0.4.0,>=0.3.20
 Requires-Dist: langchain-aws<0.3.0,>=0.2.18
 Requires-Dist: langchain-community<0.4.0,>=0.3.20
 Requires-Dist: langchain-core<0.4.0,>=0.3.49
 Requires-Dist: langchain-text-splitters<0.4.0,>=0.3.7
-Requires-Dist: psycopg2-binary<3.0.0,>=2.9.0
-Requires-Dist: langchain-postgres<0.1.0,>=0.0.14
 Requires-Dist: setuptools>=79.0.0
 Requires-Dist: pandas<3.0.0,>=2.0.0
 

fairo-25.9.1/fairo/__init__.py

@@ -0,0 +1 @@
+__version__ = "25.9.1"

{fairo-25.8.2 → fairo-25.9.1}/fairo/core/chat/chat.py

@@ -31,10 +31,10 @@ class FairoDeploymentClient(BaseDeploymentClient):
         
         # Add authentication if needed
         auth = None
-        if os.environ.get('MLFLOW_TRACKING_USERNAME') and os.environ.get('MLFLOW_TRACKING_PASSWORD'):
+        if os.environ.get('FAIRO_API_ACCESS_KEY_ID') and os.environ.get('FAIRO_API_SECRET'):
             auth = HTTPBasicAuth(
-                os.environ.get('MLFLOW_TRACKING_USERNAME'),
-                os.environ.get('MLFLOW_TRACKING_PASSWORD')
+                os.environ.get('FAIRO_API_ACCESS_KEY_ID'),
+                os.environ.get('FAIRO_API_SECRET')
             )
         
         # Make streaming request
@@ -116,10 +116,10 @@ class FairoDeploymentClient(BaseDeploymentClient):
         
         # Add authentication if needed
         auth = None
-        if os.environ.get('MLFLOW_TRACKING_USERNAME') and os.environ.get('MLFLOW_TRACKING_PASSWORD'):
+        if os.environ.get('FAIRO_API_ACCESS_KEY_ID') and os.environ.get('FAIRO_API_SECRET'):
             auth = HTTPBasicAuth(
-                os.environ.get('MLFLOW_TRACKING_USERNAME'),
-                os.environ.get('MLFLOW_TRACKING_PASSWORD')
+                os.environ.get('FAIRO_API_ACCESS_KEY_ID'),
+                os.environ.get('FAIRO_API_SECRET')
             )
         
         if os.environ.get('MLFLOW_TRACKING_TOKEN'):
@@ -183,10 +183,6 @@ class ChatFairo(ChatMlflow):
 
     def __init__(self, **kwargs):
 
-        # # TODO <- see if this can be improved
-        # os.environ["MLFLOW_TRACKING_USERNAME"] = get_mlflow_user()
-        # os.environ["MLFLOW_TRACKING_PASSWORD"] = get_mlflow_password()
-
         super().__init__(
             target_uri=os.environ.get('MLFLOW_GATEWAY_URI', get_mlflow_gateway_uri()),
             endpoint=os.environ.get('MLFLOW_GATEWAY_ROUTE', get_mlflow_gateway_chat_route()),

{fairo-25.8.2 → fairo-25.9.1}/fairo/core/execution/executor.py

@@ -1,10 +1,12 @@
 import json
 import os
-from typing import List, Any, Callable, Dict, Union
+from typing import List, Any, Callable, Dict, Optional, Type, Union
 from langchain_core.runnables import RunnableLambda, RunnableSequence
 from langchain.chains import SimpleSequentialChain
 import logging
 
+from pydantic import BaseModel
+
 import mlflow
 
 from mlflow.models.signature import ModelSignature
@@ -23,7 +25,6 @@ logger = logging.getLogger(__name__)
 class FairoExecutor:
     def __init__(
         self,
-        input_schema,
         agent_type: str = "Langchain",
         agents: List[Any] = [],
         verbose: bool = False,
@@ -33,11 +34,12 @@ class FairoExecutor:
         experiment_name: str = None,
         chain_class = SimpleSequentialChain,
         input_fields: List[str] = [],
+        input_schema: Optional[Type[BaseModel]] = None,
     ):
         if agents and runnable:
             raise ValueError("FairoExecutor cannot be initialized with both 'agents' and 'runnable'. Please provide only one.")
-        if not input_fields:
-            raise ValueError("Missing input_fields")
+        if not input_fields and not input_schema:
+            raise ValueError("Missing required parameters: please provide at least one of 'input_fields' or 'input_schema'")
         self.input_schema = input_schema
         self.agents = agents
         self.agent_type = agent_type
@@ -117,8 +119,8 @@ class FairoExecutor:
             fairo_settings = {
                 "type": type,
                 "process_graph": process_graph,
-                "schema": self.input_schema.model_json_schema(),
-                "input_fields": list(self.input_schema.model_fields.keys()),
+                "schema": self.input_schema.model_json_schema() if self.input_schema else None,
+                "input_fields": list(self.input_schema.model_fields.keys()) if self.input_schema else self.input_fields,
             }
             if process_graph:
                 mlflow.log_text(json.dumps(fairo_settings, ensure_ascii=False, indent=2), artifact_file="fairo_settings.txt")

{fairo-25.8.2 → fairo-25.9.1}/fairo/core/workflow/dependency.py

@@ -1,155 +1,16 @@
 import os
 from typing import Any, Dict, List, Optional, Tuple
-from langchain_aws import BedrockEmbeddings
 from langchain_community.embeddings.mlflow import MlflowEmbeddings
 from langchain_core.documents import Document
-from langchain_postgres import PGVector
-from fairo.settings import get_mlflow_gateway_embeddings_route, get_mlflow_gateway_uri
+from fairo.settings import get_mlflow_gateway_embeddings_route, get_mlflow_gateway_uri, get_fairo_api_key, get_fairo_api_secret, get_fairo_base_url
 from fairo.core.client.client import BaseClient
-AWS_AI_EMBEDDING_MODEL = 'cohere.embed-english-v3'
 import requests
-import uuid
+AWS_AI_EMBEDDING_MODEL = 'cohere.embed-english-v3'
 
 
 class BaseVectorStore:
     pass
 
-
-class PostgresVectorStore(BaseVectorStore):
-    """
-    A PostgreSQL-based vector store using LangChain and pgvector
-    """
-
-    def __init__(
-            self,
-            collection_name: str,
-            embedding_model_id: str = AWS_AI_EMBEDDING_MODEL,
-            region_name: str = None,
-            collection_metadata: dict = None,
-            connection_string: str = "postgresql://postgres:postgres@localhost:5432/vectordb",
-            pre_delete_collection: bool = False,
-            default_k: int = 5
-    ):
-        """
-        Args:
-            collection_name: Name of the collection in PostgreSQL
-            embedding_model_id: Bedrock embedding model ID
-            region_name: AWS region for Bedrock
-            collection_metadata: Dict for what metadata we want to add to collection
-            connection_string: PostgreSQL connection string
-        """
-        self.collection_name = collection_name
-        self.connection_string = connection_string
-
-        # Set up embeddings
-        self.embeddings = MlflowEmbeddings(
-            target_uri=get_mlflow_gateway_uri(),
-            endpoint=get_mlflow_gateway_embeddings_route(),
-        )
-
-        if collection_metadata is not None:
-            self.collection_metadata = collection_metadata
-
-        # Initialize the PGVector store
-        self.db = PGVector(
-            collection_name=collection_name,
-            connection=connection_string,
-            collection_metadata=self.collection_metadata,
-            embeddings=self.embeddings,
-            pre_delete_collection=pre_delete_collection
-        )
-
-        self.default_k = default_k
-
-    def add_documents(self, documents: List[Document]) -> None:
-        """
-        Args:
-            documents: List of Document objects to add
-        """
-        if not documents:
-            return
-        
-        # Add documents to PGVector
-        self.db.add_documents(documents)
-
-    def add_texts(self, texts: List[str], metadatas: Optional[List[Dict[str, Any]]] = None) -> None:
-        """
-        Args:
-            texts: List of text strings to add
-            metadatas: Optional list of metadata dictionaries
-        """
-        if not texts:
-            return
-
-        # Convert to Document objects
-        documents = []
-        for i, text in enumerate(texts):
-            metadata = metadatas[i] if metadatas and i < len(metadatas) else {}
-            documents.append(Document(page_content=text, metadata=metadata))
-
-        # Add to vector store
-        self.add_documents(documents)
-
-    @staticmethod
-    def _format_query(query):
-        # Temporary fix, need to consider model / do more than truncate
-        return query[0:2048]
-
-    def similarity_search(self, query: str, k: int = None) -> List[Document]:
-        """
-        Args:
-            query: The search query
-            k: Number of results to return
-        """
-        formatted_query = self._format_query(query)
-        if k is None:
-            k = self.default_k
-        return self.db.similarity_search(formatted_query, k=k)
-
-    def similarity_search_with_score(self, query: str, k: int = 4) -> List[tuple[Document, float]]:
-        """
-        Args:
-            query: The search query
-            k: Number of results to return
-        """
-        formatted_query = self._format_query(query)
-        if k is None:
-            k = self.default_k
-        return self.db.similarity_search_with_score(formatted_query, k=k)
-
-    def delete(self) -> None:
-        """Delete the collection from PostgreSQL."""
-        try:
-            # Use the internal PGVector method to delete a collection
-            self.db._client.delete_collection(self.collection_name)
-        except Exception as e:
-            print(f"Error deleting collection: {str(e)}")
-
-    @classmethod
-    def from_existing(cls, 
-                     collection_name: str,
-                     embedding_model_id: str = AWS_AI_EMBEDDING_MODEL,
-                     region_name: str = None,
-                     connection_string: str = "postgresql://postgres:postgres@localhost:5432/vectordb"):
-        """
-        Load an existing collection from PostgreSQL.
-        
-        Args:
-            collection_name: Name of the existing collection
-            embedding_model_id: Bedrock embedding model ID
-            region_name: AWS region for Bedrock
-            connection_string: PostgreSQL connection string
-            
-        Returns:
-            PostgresVectorStore instance connected to the existing collection
-        """
-        return cls(
-            collection_name=collection_name,
-            embedding_model_id=embedding_model_id,
-            region_name=region_name,
-            connection_string=connection_string
-        )
-
 class FairoVectorStore(BaseVectorStore):
     """
     A vector store implementation using the Fairo API
@@ -182,14 +43,18 @@ class FairoVectorStore(BaseVectorStore):
         self.collection_name = collection_name
 
         # Get credentials from parameters or environment
-        self.username = username or os.environ.get("FAIRO_API_ACCESS_KEY_ID")
-        self.password = password or os.environ.get("FAIRO_API_SECRET")
-        self.api_url = api_url or os.environ.get("FAIRO_BASE_URL", "https://api.fairo.ai")
+        self.username = username or get_fairo_api_key()
+        self.password = password or get_fairo_api_secret()
+        self.api_url = api_url or get_fairo_base_url()
         self.fairo_auth_token = os.environ.get("FAIRO_AUTH_TOKEN")
-
+        # Setup credentials
         if not self.fairo_auth_token and (not self.username or not self.password):
             raise ValueError("Fairo API credentials must be provided either as FAIRO_AUTH_TOKEN or as parameters or in the FAIRO_USERNAME and FAIRO_PASSWORD environment variables")
 
+        if(self.username and self.password):
+            os.environ["MLFLOW_TRACKING_USERNAME"] = self.username
+            os.environ["MLFLOW_TRACKING_PASSWORD"] = self.password
+            
         # Initialize API client
         self.client = BaseClient(
             base_url=self.api_url.rstrip('/'),
@@ -429,7 +294,7 @@ class FairoVectorStore(BaseVectorStore):
                      collection_name: str,
                      username: str = None,
                      password: str = None,
-                     api_url: str = "https://api.fairo.ai",
+                     api_url: str = get_fairo_base_url(),
                      embedding_model_id: str = AWS_AI_EMBEDDING_MODEL,
                      region_name: str = None):
         """

{fairo-25.8.2 → fairo-25.9.1}/fairo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairo
-Version: 25.8.2
+Version: 25.9.1
 Summary: SDK for interfacing with Fairo SaaS platform.
 Author-email: "Fairo Systems, Inc." <support@fairo.ai>
 License: Apache-2.0
@@ -11,14 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: mlflow<=3.2.0,>=3.1.0
+Requires-Dist: mlflow<=3.1.1,>=3.1.0
 Requires-Dist: langchain<0.4.0,>=0.3.20
 Requires-Dist: langchain-aws<0.3.0,>=0.2.18
 Requires-Dist: langchain-community<0.4.0,>=0.3.20
 Requires-Dist: langchain-core<0.4.0,>=0.3.49
 Requires-Dist: langchain-text-splitters<0.4.0,>=0.3.7
-Requires-Dist: psycopg2-binary<3.0.0,>=2.9.0
-Requires-Dist: langchain-postgres<0.1.0,>=0.0.14
 Requires-Dist: setuptools>=79.0.0
 Requires-Dist: pandas<3.0.0,>=2.0.0
 

{fairo-25.8.2 → fairo-25.9.1}/fairo.egg-info/requires.txt

@@ -1,10 +1,8 @@
-mlflow<=3.2.0,>=3.1.0
+mlflow<=3.1.1,>=3.1.0
 langchain<0.4.0,>=0.3.20
 langchain-aws<0.3.0,>=0.2.18
 langchain-community<0.4.0,>=0.3.20
 langchain-core<0.4.0,>=0.3.49
 langchain-text-splitters<0.4.0,>=0.3.7
-psycopg2-binary<3.0.0,>=2.9.0
-langchain-postgres<0.1.0,>=0.0.14
 setuptools>=79.0.0
 pandas<3.0.0,>=2.0.0

{fairo-25.8.2 → fairo-25.9.1}/pyproject.toml

@@ -20,14 +20,12 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "mlflow>=3.1.0,<=3.2.0",
+    "mlflow>=3.1.0,<=3.1.1",
     "langchain>=0.3.20,<0.4.0",
     "langchain-aws>=0.2.18,<0.3.0",
     "langchain-community>=0.3.20,<0.4.0",
     "langchain-core>=0.3.49,<0.4.0",
     "langchain-text-splitters>=0.3.7,<0.4.0",
-    "psycopg2-binary>=2.9.0,<3.0.0",
-    "langchain-postgres>=0.0.14,<0.1.0",
     "setuptools>=79.0.0",
     "pandas>=2.0.0,<3.0.0"
 ]

fairo-25.8.2/fairo/__init__.py

@@ -1 +0,0 @@
-__version__ = "25.8.2"