chore: restore endpoint

Author: thedevtoni

cases.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 from orquesta_sdk.helpers import orquesta_openai_parameters_mapper
 
 import os
@@ -7,11 +8,24 @@
 from orquesta_sdk.remoteconfigs import OrquestaRemoteConfigRequest
 
 api_key = os.environ.get("ORQUESTA_API_KEY", "__API_KEY__")
+=======
+import os
+
+from orquesta_sdk import OrquestaClient, OrquestaClientOptions
+from orquesta_sdk.endpoints import OrquestaEndpoint, OrquestaEndpointRequest
+from orquesta_sdk.exceptions import OrquestaException
+
+api_key = os.environ.get(
+    "ORQUESTA_API_KEY",
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3b3Jrc3BhY2VJZCI6IjhkMjZjODdkLTU1YzUtNDM0My1hYmI0LWM0YTAxYjFhNDVhMSIsImlhdCI6MTY5Nzk3NzgyMDE3M30.01jUpko1fW5mP7rlvME7NfEnrDocfSm7UWNSaE8iEZY",
+)
+>>>>>>> 113e75d ( cd /Users/tony/Projects/orquesta/orquesta-python ; /usr/bin/env /Users/tony/Projects/orquesta/orquesta-python/venv/bin/python /Users/tony/.vscode/extensions/ms-python.python-2023.18.0/pythonFiles/lib/python/debugpy/adapter/../../debugpy/launcher 51707 -- /Users/tony/Projects/orquesta/orquesta-python/cases.py)
 
 options = OrquestaClientOptions(api_key=api_key, ttl=3600, environment="production")
 
 client = OrquestaClient(options)
 
+<<<<<<< HEAD
 request = OrquestaPromptRequest(
     key="prompt_key",
     context={"environments": "production", "workspaceId": "soql1odAABC2"},
@@ -30,3 +44,19 @@
 )
 
 print(prompt.value)
+=======
+request = OrquestaEndpointRequest(
+    key="chat-multimodel",
+)
+
+
+stream_generator = client.endpoints.stream(request)
+
+try:
+    for chunk in stream_generator:
+        print("Received data:", chunk.content)
+except OrquestaException as e:
+    print("Error:", e)
+except Exception as e:
+    print("Error:", e)
+>>>>>>> 113e75d ( cd /Users/tony/Projects/orquesta/orquesta-python ; /usr/bin/env /Users/tony/Projects/orquesta/orquesta-python/venv/bin/python /Users/tony/.vscode/extensions/ms-python.python-2023.18.0/pythonFiles/lib/python/debugpy/adapter/../../debugpy/launcher 51707 -- /Users/tony/Projects/orquesta/orquesta-python/cases.py)

orquesta_sdk/client.py

@@ -9,6 +9,7 @@
 
 class OrquestaInvalidAPIException(BaseException):
     """Raised if the provider API key is invalid."""
+
     pass
 
 
@@ -20,6 +21,6 @@ def __init__(self, options: OrquestaClientOptions):
         if not api_key:
             raise OrquestaInvalidAPIException("The provided API key is invalid.")
 
-        self.endpoints = OrquestaEndpoints(options, cache)
+        self.endpoints = OrquestaEndpoints(options)
         self.prompts = OrquestaPrompts(options, cache)
         self.remoteconfigs = OrquestaRemoteConfigs(options, cache)

orquesta_sdk/endpoints.py

@@ -1,11 +1,9 @@
 from typing import Any, Dict, Optional
 
-from .cache import CacheStore
+from .exceptions import OrquestaException
 from .options import OrquestaClientOptions
-from .request import post, ENDPOINTS_API, METRICS_API
-from reactivex import create, Observable
-
-from .utils import extract_json
+from .request import ENDPOINTS_API, METRICS_API, post
+from .utils import extract_json, notify_error
 
 
 class OrquestaEndpointRequest:
@@ -77,9 +75,8 @@ def add_metrics(self, metrics: OrquestaEndpointMetrics) -> None:
 
 
 class OrquestaEndpoints:
-    def __init__(self, options: OrquestaClientOptions, cache: CacheStore):
+    def __init__(self, options: OrquestaClientOptions):
         self.__options = options
-        self.__cache = cache
 
     def query(
         self,
@@ -91,6 +88,9 @@ def query(
             body=request.to_dict(),
         )
 
+        if response.ok is None or response.status_code != 200:
+            notify_error(response)
+
         data = response.json()
 
         return OrquestaEndpoint(
@@ -100,35 +100,24 @@ def query(
             trace_id=data.get("trace_id"),
         )
 
-    def stream(self, request: OrquestaEndpointRequest) -> Observable[OrquestaEndpoint]:
-        def handle_stream(observer, _):
-            with post(
-                url=ENDPOINTS_API,
-                api_key=self.__options.api_key,
-                body=request.to_dict(),
-                stream=True,
-            ) as response:
-                if response.ok is None or response.status_code != 200:
-                    observer.on_error(response.json())
-                    return
-
-                for line in response.iter_lines():
-                    if line:
-                        data = extract_json(line)
-
-                        if data.get("is_final") or "[DONE]" in line.decode("utf-8"):
-                            observer.on_completed()
-                            break
-
-                        if data:
-                            endpoint_chunk = OrquestaEndpoint(
-                                self.__options,
-                                content=data.get("content"),
-                                is_final=data.get("is_final"),
-                                trace_id=data.get("trace_id"),
-                            )
-                            observer.on_next(endpoint_chunk)
-
-        source = create(handle_stream)
-
-        return source
+    def stream(self, request: OrquestaEndpointRequest):
+        with post(
+            url=ENDPOINTS_API,
+            api_key=self.__options.api_key,
+            body=request.to_dict(),
+            stream=True,
+        ) as response:
+            if response.ok is None or response.status_code != 200:
+                notify_error(response)
+
+            for line in response.iter_lines():
+                if line:
+                    data = extract_json(line)
+
+                    if data:
+                        yield OrquestaEndpoint(
+                            self.__options,
+                            content=data.get("content"),
+                            is_final=data.get("is_final"),
+                            trace_id=data.get("trace_id"),
+                        )

orquesta_sdk/exceptions.py

@@ -0,0 +1,19 @@
+from typing import Optional
+
+
+class OrquestaException(Exception):
+    def __init__(
+        self,
+        name: str,
+        message: str,
+        code: str,
+        provider_error_message: Optional[str] = None,
+    ) -> None:
+        super().__init__(message)
+        self.message = message
+        self.name = name
+        self.provider_error_message = provider_error_message
+        self.code = code
+
+    def __str__(self) -> str:
+        return f"{self.code}: {self.message}"

orquesta_sdk/prompts.py

@@ -1,6 +1,8 @@
 import time
 from typing import Any, Dict, Optional
 
+from orquesta_sdk.utils import notify_error
+
 from .cache import CacheStore
 from .options import OrquestaClientOptions
 from .request import PROMPTS_API, post, METRICS_API
@@ -21,11 +23,11 @@ class OrquestaPromptRequest:
     """
 
     def __init__(
-            self,
-            key: str,
-            context: Optional[Dict[str, Any]] = None,
-            variables: Optional[Dict[str, Any]] = None,
-            metadata: Optional[Dict[str, Any]] = None
+        self,
+        key: str,
+        context: Optional[Dict[str, Any]] = None,
+        variables: Optional[Dict[str, Any]] = None,
+        metadata: Optional[Dict[str, Any]] = None,
     ):
         """
         Initializes a new OrquestaPromptRequest instance.
@@ -70,10 +72,10 @@ def to_dict(self):
 
 class OrquestaPromptMetricsEconomics:
     def __init__(
-            self,
-            prompt_tokens: Optional[int],
-            completion_tokens: int,
-            total_tokens: Optional[int],
+        self,
+        prompt_tokens: Optional[int],
+        completion_tokens: int,
+        total_tokens: Optional[int],
     ):
         """
         Initializes an instance of the OrquestaPromptMetricsEconomics class.
@@ -94,12 +96,12 @@ def __init__(
 
 class OrquestaPromptMetrics:
     def __init__(
-            self,
-            score: Optional[float] = None,
-            latency: Optional[int] = None,
-            metadata: Optional[Dict[str, Any]] = None,
-            llm_response: Optional[str] = None,
-            economics: Optional[OrquestaPromptMetricsEconomics] = None,
+        self,
+        score: Optional[float] = None,
+        latency: Optional[int] = None,
+        metadata: Optional[Dict[str, Any]] = None,
+        llm_response: Optional[str] = None,
+        economics: Optional[OrquestaPromptMetricsEconomics] = None,
     ):
         self.score = score
         self.latency = latency
@@ -126,10 +128,10 @@ def to_dict(self):
 
 class OrquestaPrompt:
     def __init__(
-            self,
-            options: OrquestaClientOptions,
-            value: Any,
-            trace_id: Optional[str],
+        self,
+        options: OrquestaClientOptions,
+        value: Any,
+        trace_id: Optional[str],
     ):
         self.__options = options
         self.value = value
@@ -138,13 +140,9 @@ def __init__(
 
     def add_metrics(self, metrics: OrquestaPromptMetrics) -> None:
         body = metrics.to_dict()
-        body['trace_id'] = self.trace_id
+        body["trace_id"] = self.trace_id
 
-        return post(
-            api_key=self.__options.api_key,
-            url=METRICS_API,
-            body=body
-        )
+        return post(api_key=self.__options.api_key, url=METRICS_API, body=body)
 
 
 class OrquestaPrompts:
@@ -153,10 +151,9 @@ def __init__(self, options: OrquestaClientOptions, cache: CacheStore):
         self.__cache = cache
 
     def query(
-            self,
-            request: OrquestaPromptRequest,
+        self,
+        request: OrquestaPromptRequest,
     ) -> OrquestaPrompt:
-
         context = request.context or {}
 
         cached_result = self.__cache.get(request.key, context)
@@ -165,17 +162,18 @@ def query(
             return cached_result.result
 
         response = post(
-            url=PROMPTS_API,
-            api_key=self.__options.api_key,
-            body=request.to_dict()
+            url=PROMPTS_API, api_key=self.__options.api_key, body=request.to_dict()
         )
 
+        if response.ok is None or response.status_code != 200:
+            notify_error(response)
+
         data = response.json().get(request.key, {})
 
         prompt = OrquestaPrompt(
             options=self.__options,
             value=data.get("value"),
-            trace_id=data.get("trace_id")
+            trace_id=data.get("trace_id"),
         )
 
         if prompt.trace_id and prompt.value is not None:

orquesta_sdk/request.py

@@ -17,15 +17,15 @@ def post(url: str, api_key: str, body: dict, stream=False, environment=None):
         "User-Agent": "orquesta/{};python".format(__version__),
     }
 
-    if stream:
-        headers["Accept"] = "text/event-stream"
-        body["stream"] = True
-
     if environment:
         if body.get("context", None) is None:
             body["context"] = {"environments": [environment]}
         else:
             body["context"]["environments"] = [environment]
 
-    response = requests.post(url, json=body, headers=headers)
-    return response
+    if stream:
+        headers["Accept"] = "text/event-stream"
+        body["stream"] = True
+        return requests.post(url, json=body, headers=headers, stream=True)
+
+    return requests.post(url, json=body, headers=headers)

orquesta_sdk/utils.py

@@ -1,5 +1,7 @@
 import json
 
+from .exceptions import OrquestaException
+
 
 def are_object_equals(dict1, dict2):
     if isinstance(dict1, dict) and isinstance(dict2, dict):
@@ -27,10 +29,11 @@ def are_object_equals(dict1, dict2):
 def dict_cleanup(input_dict):
     return {k: v for k, v in input_dict.items() if v is not None}
 
+
 def extract_json(byte_string):
     try:
-        decoded_string = byte_string.decode('utf-8')
-        if decoded_string.startswith('data: '):
+        decoded_string = byte_string.decode("utf-8")
+        if decoded_string.startswith("data: "):
             json_str = decoded_string[6:]  # Remove the 'data: ' prefix
             json_obj = json.loads(json_str)
             return json_obj
@@ -40,3 +43,17 @@ def extract_json(byte_string):
         return None
     except UnicodeDecodeError:
         return None
+
+
+def notify_error(response):
+    error = response.json()
+
+    if "error" not in error and "message" not in error:
+        response.raise_for_status()
+
+    raise OrquestaException(
+        name=error["name"],
+        message=error["message"],
+        provider_error_message=error.get("provider_error_message", None),
+        code=error["error_code"],
+    )

pyproject.toml

@@ -25,7 +25,6 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0.0"
 requests = "^2.28.2"
-reactivex = "^4.0.4"
 
 [tool.poetry.dev-dependencies]
 black = "^21.9b0"