PyPI - clarifai - Versions diffs - 11.4.5__tar.gz → 11.4.6__tar.gz - Mend

@@ -11,27 +11,29 @@ class OpenAIModelClass(ModelClass):
     This handles all the transport between the API and the OpenAI-compatible server.
     To use this class, create a subclass and set the following class attributes:
-    - openai_client: The OpenAI-compatible client instance
-    - model_name: The name of the model to use with the client
+    - client: The OpenAI-compatible client instance
+    - model: The name of the model to use with the client
     Example:
         class MyOpenAIModel(OpenAIModelClass):
-            openai_client = OpenAI(api_key="your-key")
-            model_name = "gpt-4"
+            client = OpenAI(api_key="your-key")
+            model = "gpt-4"
     """
     # These should be overridden in subclasses
-    openai_client = None
-    model_name = None
+    client = None
+    model = None
     def __init__(self) -> None:
-        if self.openai_client is None:
-            raise NotImplementedError("Subclasses must set the 'openai_client' class attribute")
-        if self.model_name is None:
-            self.model_name = self.openai_client.models.list().data[0].id
-        self.client = self.openai_client
-        self.model = self.model_name
+        if self.client is None:
+            raise NotImplementedError("Subclasses must set the 'client' class attribute")
+        if self.model is None:
+            try:
+                self.model = self.client.models.list().data[0].id
+            except Exception as e:
+                raise NotImplementedError(
+                    "Subclasses must set the 'model' class attribute or ensure the client can list models"
+                ) from e
     def _extract_request_params(self, request_data: Dict[str, Any]) -> Dict[str, Any]:
         """Extract and validate common openai arguments parameters from the request data.

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.4.5
+Version: 11.4.6
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

@@ -144,8 +144,8 @@ class MockCompletionStream:
 class DummyOpenAIModel(OpenAIModelClass):
     """Dummy OpenAI model implementation for testing."""
-    openai_client = MockOpenAIClient()
-    model_name = "dummy-model"
+    client = MockOpenAIClient()
+    model = "dummy-model"
     def _process_request(self, **kwargs) -> Dict[str, Any]:
         """Process a request for non-streaming responses."""

@@ -6,6 +6,7 @@ import traceback
 from abc import ABC
 from collections import abc
 from typing import Any, Dict, Iterator, List
+from unittest.mock import MagicMock
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
 from clarifai_grpc.grpc.api.status import status_code_pb2, status_pb2
@@ -346,6 +347,13 @@ class ModelClass(ABC):
         methods = {}
         for base in reversed(cls.__mro__):
             for name, method in base.__dict__.items():
+                # Skip class attributes, mocked objects, and non-methods
+                if not callable(method) or isinstance(method, (classmethod, staticmethod)):
+                    continue
+                # Skip any mocked objects or attributes
+                if isinstance(method, MagicMock) or hasattr(method, '_mock_return_value'):
+                    continue
+                # Only include methods that have been decorated with @ModelClass.method
                 method_info = getattr(method, _METHOD_INFO_ATTR, None)
                 if not method_info:  # regular function, not a model method
                     continue

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.4.5
+Version: 11.4.6
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

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

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

clarifai 11.4.5__tar.gz → 11.4.6__tar.gz

clarifai 11.4.5tar.gz → 11.4.6tar.gz