fairo 25.7.1__tar.gz → 25.7.2__tar.gz

{fairo-25.7.1 → fairo-25.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairo
-Version: 25.7.1
+Version: 25.7.2
 Summary: SDK for interfacing with Fairo SaaS platform.
 Author-email: "Fairo Systems, Inc." <support@fairo.ai>
 License: Apache-2.0

fairo-25.7.2/fairo/__init__.py

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

fairo-25.7.2/fairo/core/chat/chat.py

@@ -0,0 +1,227 @@
+
+from langchain_community.chat_models.mlflow import ChatMlflow
+from mlflow.deployments import get_deploy_client
+from mlflow.deployments.base import BaseDeploymentClient
+from fairo.settings import get_mlflow_gateway_chat_route, get_mlflow_gateway_uri, get_mlflow_user, get_mlflow_password
+import requests
+from requests.auth import HTTPBasicAuth
+import json
+import os
+
+class FairoDeploymentClient(BaseDeploymentClient):
+    """Custom deployment client that implements predict_stream for Fairo endpoints."""
+    
+    def __init__(self, target_uri: str, endpoint: str):
+        self.target_uri = target_uri
+        self.endpoint = endpoint
+        
+    def predict_stream(self, deployment_name=None, inputs=None, endpoint=None):
+        """
+        Implement streaming predictions by making HTTP requests to the Fairo gateway.
+        """
+        endpoint = endpoint or self.endpoint
+        
+        # Use the gateway URL to make streaming requests
+        gateway_url = f"{self.target_uri.rstrip('/')}/gateway/{endpoint}/invocations"
+        
+        headers = {
+            'Content-Type': 'application/json',
+            'Accept': 'text/event-stream'
+        }
+        
+        # Add authentication if needed
+        auth = None
+        if os.environ.get('MLFLOW_TRACKING_USERNAME') and os.environ.get('MLFLOW_TRACKING_PASSWORD'):
+            auth = HTTPBasicAuth(
+                os.environ.get('MLFLOW_TRACKING_USERNAME'),
+                os.environ.get('MLFLOW_TRACKING_PASSWORD')
+            )
+        
+        # Make streaming request
+        try:
+            response = requests.post(
+                gateway_url,
+                json={**inputs, "stream": True},
+                headers=headers,
+                auth=auth,
+            )
+            
+            if response.status_code != 200:
+                error_text = response.text
+                raise Exception(f"HTTP {response.status_code}: {error_text}")
+                
+            # Check if response is actually streaming
+            content_type = response.headers.get('content-type', '')
+            
+            chunk_count = 0
+            
+            # Parse streaming response
+            for line in response.iter_lines():
+                if line:
+                    line = line.decode('utf-8')
+                    
+                    # Handle different streaming formats
+                    if line.startswith('data: '):
+                        try:
+                            data_str = line[6:]  # Remove 'data: ' prefix
+                            if data_str.strip() == '[DONE]':
+                                break
+                            data = json.loads(data_str)
+                            chunk_count += 1
+                            yield data
+                        except json.JSONDecodeError as e:
+                            continue
+                    else:
+                        # Try parsing as direct JSON
+                        try:
+                            data = json.loads(line)
+                            chunk_count += 1
+                            yield data
+                        except json.JSONDecodeError:
+                            continue
+                            
+            
+            # If no chunks were yielded, fall back to non-streaming
+            if chunk_count == 0:
+                # Try to get the full response as JSON
+                try:
+                    if hasattr(response, 'json'):
+                        result = response.json()
+                        yield result
+                except:
+                    # Create a minimal response to avoid the error
+                    yield {
+                        "choices": [{
+                            "delta": {"content": "", "role": "assistant"},
+                            "finish_reason": "stop"
+                        }]
+                    }
+                    
+        except requests.exceptions.RequestException as e:
+            raise Exception(f"Request failed: {e}")
+    
+    def predict(self, deployment_name=None, inputs=None, endpoint=None):
+        """
+        Implement synchronous predictions by making HTTP requests to the Fairo gateway.
+        """
+        endpoint = endpoint or self.endpoint
+        
+        # Use the gateway URL to make requests
+        gateway_url = f"{self.target_uri.rstrip('/')}/gateway/{endpoint}/invocations"
+        
+        headers = {
+            'Content-Type': 'application/json',
+            'Accept': 'application/json'
+        }
+        
+        # Add authentication if needed
+        auth = None
+        if os.environ.get('MLFLOW_TRACKING_USERNAME') and os.environ.get('MLFLOW_TRACKING_PASSWORD'):
+            auth = HTTPBasicAuth(
+                os.environ.get('MLFLOW_TRACKING_USERNAME'),
+                os.environ.get('MLFLOW_TRACKING_PASSWORD')
+            )
+        
+        # Make request
+        response = requests.post(
+            gateway_url,
+            json=inputs,
+            headers=headers,
+            auth=auth
+        )
+        
+        if response.status_code != 200:
+            raise Exception(f"HTTP {response.status_code}: {response.text}")
+            
+        return response.json()
+    
+    def get_deployment(self, name, endpoint=None):
+        """Get deployment information."""
+        raise NotImplementedError("get_deployment not implemented")
+        
+    def list_deployments(self, endpoint=None):
+        """List available deployments."""
+        raise NotImplementedError("list_deployments not implemented")
+        
+    def get_endpoint(self, endpoint):
+        """Get endpoint information."""
+        raise NotImplementedError("get_endpoint not implemented")
+        
+    def list_endpoints(self):
+        """List available endpoints."""
+        raise NotImplementedError("list_endpoints not implemented")
+        
+    def create_deployment(self, name, config, endpoint=None):
+        """Create a new deployment."""
+        raise NotImplementedError("create_deployment not implemented")
+        
+    def update_deployment(self, name, config, endpoint=None):
+        """Update an existing deployment."""
+        raise NotImplementedError("update_deployment not implemented")
+        
+    def delete_deployment(self, name, endpoint=None):
+        """Delete a deployment."""
+        raise NotImplementedError("delete_deployment not implemented")
+        
+    def create_endpoint(self, name, config):
+        """Create a new endpoint."""
+        raise NotImplementedError("create_endpoint not implemented")
+        
+    def update_endpoint(self, name, config):
+        """Update an existing endpoint."""
+        raise NotImplementedError("update_endpoint not implemented")
+        
+    def delete_endpoint(self, name):
+        """Delete an endpoint."""
+        raise NotImplementedError("delete_endpoint not implemented")
+
+
+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()),
+            **kwargs
+        )
+        
+        self._client = FairoDeploymentClient(self.target_uri, self.endpoint)
+
+    @property
+    def _target_uri(self):
+        return os.environ.get("MLFLOW_GATEWAY_URI", None)
+
+    @property
+    def _endpoint(self):
+        return os.environ.get("MLFLOW_GATEWAY_ROUTE", None)
+
+    def invoke(self, *args, **kwargs):
+        # Override invoke to use dynamic target_uri
+        self.target_uri = self._target_uri
+        self._client = FairoDeploymentClient(self.target_uri, self.endpoint)
+        return super().invoke(*args, **kwargs)
+
+
+class FairoChat(ChatMlflow):
+    def __init__(self, endpoint, **kwargs):
+        super().__init__(
+            target_uri=os.environ.get('MLFLOW_GATEWAY_URI', None),
+            endpoint=endpoint,
+            # extra_params={"workflow_run_id": workflow_run_id},
+            **kwargs
+        )
+
+    @property
+    def _target_uri(self):
+        return os.environ.get("MLFLOW_GATEWAY_URI", None)
+    
+    def invoke(self, *args, **kwargs):
+        # Override invoke to use dynamic target_uri
+        self.target_uri = self._target_uri
+        self._client = get_deploy_client(self.target_uri)
+        return super().invoke(*args, **kwargs)

{fairo-25.7.1 → fairo-25.7.2}/fairo/core/workflow/utils.py

@@ -1,7 +1,6 @@
 
 from typing import List
 from fairo.core.agent.base_agent import SimpleAgent
-from fairo.core.workflow.dependency import FairoVectorStore, PostgresVectorStore
 
 
 def output_workflow_tools(agents):
@@ -230,13 +229,7 @@ def output_langchain_process_graph(agents):
             if fn and fn.__closure__:
                 for cell in fn.__closure__:
                     val = cell.cell_contents
-                    if (
-                        (
-                            FairoVectorStore and isinstance(val, FairoVectorStore)
-                        ) or (
-                            PostgresVectorStore and isinstance(val, PostgresVectorStore)
-                        )
-                    ) and val.collection_name not in seen_collections:
+                    if type(val).__name__ in ("FairoVectorStore", "PostgresVectorStore") and val.collection_name not in seen_collections:
                         vector_stores.append(val)
                         seen_collections.add(val.collection_name)
 
@@ -266,13 +259,7 @@ def output_langchain_process_graph(agents):
             if fn and fn.__closure__:
                 for cell in fn.__closure__:
                     val = cell.cell_contents
-                    if (
-                        (
-                            FairoVectorStore and isinstance(val, FairoVectorStore)
-                        ) or (
-                            PostgresVectorStore and isinstance(val, PostgresVectorStore)
-                        )
-                    ) and val.collection_name in dependency_map:
+                    if type(val).__name__ in ("FairoVectorStore", "PostgresVectorStore") and val.collection_name in dependency_map:
                         num = dependency_map[val.collection_name]
                         if num not in agent_deps:
                             agent_deps.append(num)

{fairo-25.7.1 → fairo-25.7.2}/fairo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairo
-Version: 25.7.1
+Version: 25.7.2
 Summary: SDK for interfacing with Fairo SaaS platform.
 Author-email: "Fairo Systems, Inc." <support@fairo.ai>
 License: Apache-2.0

fairo-25.7.1/fairo/__init__.py

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

fairo-25.7.1/fairo/core/chat/chat.py

@@ -1,54 +0,0 @@
-
-from langchain_community.chat_models.mlflow import ChatMlflow
-from mlflow.deployments import get_deploy_client
-from fairo.settings import get_mlflow_gateway_chat_route, get_mlflow_gateway_uri, get_mlflow_user, get_mlflow_password
-import os
-
-
-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()),
-            **kwargs
-        )
-
-    @property
-    def _target_uri(self):
-        return os.environ.get("MLFLOW_GATEWAY_URI", None)
-
-    @property
-    def _endpoint(self):
-        return os.environ.get("MLFLOW_GATEWAY_ROUTE", None)
-
-    def invoke(self, *args, **kwargs):
-        # Override invoke to use dynamic target_uri
-        self.target_uri = self._target_uri
-        self._client = get_deploy_client(self.target_uri)
-        return super().invoke(*args, **kwargs)
-
-
-class FairoChat(ChatMlflow):
-    def __init__(self, endpoint, **kwargs):
-        super().__init__(
-            target_uri=os.environ.get('MLFLOW_GATEWAY_URI', None),
-            endpoint=endpoint,
-            # extra_params={"workflow_run_id": workflow_run_id},
-            **kwargs
-        )
-
-    @property
-    def _target_uri(self):
-        return os.environ.get("MLFLOW_GATEWAY_URI", None)
-    
-    def invoke(self, *args, **kwargs):
-        # Override invoke to use dynamic target_uri
-        self.target_uri = self._target_uri
-        self._client = get_deploy_client(self.target_uri)
-        return super().invoke(*args, **kwargs)