clarifai 11.4.5__py3-none-any.whl → 11.4.7__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.4.5"
+__version__ = "11.4.7"

clarifai/cli/base.py

@@ -8,7 +8,7 @@ import yaml
 
 from clarifai.utils.cli import AliasedGroup, TableFormatter, load_command_modules
 from clarifai.utils.config import Config, Context
-from clarifai.utils.constants import DEFAULT_CONFIG
+from clarifai.utils.constants import DEFAULT_BASE, DEFAULT_CONFIG, DEFAULT_UI
 from clarifai.utils.logging import logger
 
 
@@ -31,7 +31,8 @@ def cli(ctx, config):
                     'default',
                     CLARIFAI_PAT=os.environ.get('CLARIFAI_PAT', ''),
                     CLARIFAI_USER_ID=os.environ.get('CLARIFAI_USER_ID', ''),
-                    CLARIFAI_API_BASE=os.environ.get('CLARIFAI_API_BASE', 'api.clarifai.com'),
+                    CLARIFAI_API_BASE=DEFAULT_BASE,
+                    CLARIFAI_UI=DEFAULT_UI,
                 )
             },
         )

clarifai/cli/model.py

@@ -505,7 +505,7 @@ def local_dev(ctx, model_path):
     logger.info(f"Current deployment_id: {deployment_id}")
 
     logger.info(
-        f"Full url for the model: /users/{user_id}/apps/{app_id}/models/{model.id}/versions/{version.id}"
+        f"Full url for the model: {ctx.obj.current.ui}/users/{user_id}/apps/{app_id}/models/{model.id}/versions/{version.id}"
     )
 
     # Now that we have all the context in ctx.obj, we need to update the config.yaml in
@@ -542,7 +542,6 @@ def local_dev(ctx, model_path):
         app_id=app_id,
         model_id=model_id,
         deployment_id=deployment_id,
-        use_ctx=True,
         base_url=ctx.obj.current.api_base,
     )
 
@@ -683,7 +682,14 @@ def predict(
                 "Either --compute_cluster_id & --nodepool_id or --deployment_id must be provided."
             )
     if model_url:
-        model = Model(url=model_url, pat=ctx.obj['pat'], base_url=ctx.obj['base_url'])
+        model = Model(
+            url=model_url,
+            pat=ctx.obj['pat'],
+            base_url=ctx.obj['base_url'],
+            compute_cluster_id=compute_cluster_id,
+            nodepool_id=nodepool_id,
+            deployment_id=deployment_id,
+        )
     else:
         model = Model(
             model_id=model_id,
@@ -691,6 +697,9 @@ def predict(
             app_id=app_id,
             pat=ctx.obj['pat'],
             base_url=ctx.obj['base_url'],
+            compute_cluster_id=compute_cluster_id,
+            nodepool_id=nodepool_id,
+            deployment_id=deployment_id,
         )
 
     if inference_params:
@@ -702,9 +711,6 @@ def predict(
         model_prediction = model.predict_by_filepath(
             filepath=file_path,
             input_type=input_type,
-            compute_cluster_id=compute_cluster_id,
-            nodepool_id=nodepool_id,
-            deployment_id=deployment_id,
             inference_params=inference_params,
             output_config=output_config,
         )
@@ -712,9 +718,6 @@ def predict(
         model_prediction = model.predict_by_url(
             url=url,
             input_type=input_type,
-            compute_cluster_id=compute_cluster_id,
-            nodepool_id=nodepool_id,
-            deployment_id=deployment_id,
             inference_params=inference_params,
             output_config=output_config,
         )
@@ -723,9 +726,6 @@ def predict(
         model_prediction = model.predict_by_bytes(
             input_bytes=bytes,
             input_type=input_type,
-            compute_cluster_id=compute_cluster_id,
-            nodepool_id=nodepool_id,
-            deployment_id=deployment_id,
             inference_params=inference_params,
             output_config=output_config,
         )  ## TO DO: Add support for input_id

clarifai/client/model.py

@@ -108,7 +108,6 @@ class Model(Lister, BaseClient):
             compute_cluster_id=compute_cluster_id,
             nodepool_id=nodepool_id,
             deployment_id=deployment_id,
-            user_id=self.user_id,  # FIXME the deployment's user_id can be different than the model's.
         )
         BaseClient.__init__(
             self,
@@ -123,14 +122,12 @@ class Model(Lister, BaseClient):
 
     @classmethod
     def from_current_context(cls, **kwargs) -> 'Model':
-        from clarifai.utils.config import Config
+        from clarifai.urls.helper import ClarifaiUrlHelper
 
-        current = Config.from_yaml().current
-
-        # set the current context to env vars.
-        current.set_to_env()
-
-        url = f"https://clarifai.com/{current.user_id}/{current.app_id}/models/{current.model_id}"
+        # passing None to ClarifaiUrlHelper uses the current context to set it up.
+        url_helper = ClarifaiUrlHelper()
+        current = url_helper.current_ctx
+        url = url_helper.clarifai_url(resource_type="models", resource_id=current.model_id)
 
         # construct the Model object.
         kwargs = {}
@@ -601,8 +598,13 @@ class Model(Lister, BaseClient):
         compute_cluster_id: str = None,
         nodepool_id: str = None,
         deployment_id: str = None,
-        user_id: str = None,
     ):
+        # Get UserID
+        if any([deployment_id, nodepool_id, compute_cluster_id]):
+            from clarifai.client.user import User
+
+            user_id = User().get_user_info(user_id='me').user.id
+
         runner_selector = None
         if deployment_id and (compute_cluster_id or nodepool_id):
             raise UserError(
@@ -610,22 +612,10 @@ class Model(Lister, BaseClient):
             )
 
         if deployment_id:
-            if not user_id and not os.environ.get('CLARIFAI_USER_ID'):
-                raise UserError(
-                    "User ID is required for model prediction with deployment ID, please provide user_id in the method call."
-                )
-            if not user_id:
-                user_id = os.environ.get('CLARIFAI_USER_ID')
             runner_selector = Deployment.get_runner_selector(
                 user_id=user_id, deployment_id=deployment_id
             )
         elif compute_cluster_id and nodepool_id:
-            if not user_id and not os.environ.get('CLARIFAI_USER_ID'):
-                raise UserError(
-                    "User ID is required for model prediction with compute cluster ID and nodepool ID, please provide user_id in the method call."
-                )
-            if not user_id:
-                user_id = os.environ.get('CLARIFAI_USER_ID')
             runner_selector = Nodepool.get_runner_selector(
                 user_id=user_id, compute_cluster_id=compute_cluster_id, nodepool_id=nodepool_id
             )

clarifai/client/user.py

@@ -427,6 +427,24 @@ class User(Lister, BaseClient):
             raise Exception(response.status)
         self.logger.info("\nCompute Cluster Deleted\n%s", response.status)
 
+    def get_user_info(self, user_id: str = None) -> resources_pb2.User:
+        """Returns the user information for the specified user ID.
+
+        Args:
+            user_id (str): The user ID for the user to interact with.
+
+        Returns:
+            User: A User object for the specified user ID.
+        """
+        request = service_pb2.GetUserRequest(
+            user_app_id=resources_pb2.UserAppIDSet(user_id=user_id if user_id else self.id)
+        )
+        response = self._grpc_request(self.STUB.GetUser, request)
+        if response.status.code != status_code_pb2.SUCCESS:
+            raise Exception(response.status)
+
+        return response
+
     def __getattr__(self, name):
         return getattr(self.user_info, name)
 

clarifai/runners/models/dummy_openai_model.py

@@ -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."""

clarifai/runners/models/model_class.py

@@ -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

clarifai/runners/models/openai_class.py

@@ -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.

clarifai/runners/utils/code_script.py

@@ -5,6 +5,20 @@ from clarifai_grpc.grpc.api import resources_pb2
 
 from clarifai.runners.utils import data_utils
 from clarifai.urls.helper import ClarifaiUrlHelper
+from clarifai.utils.constants import MCP_TRANSPORT_NAME, OPENAI_TRANSPORT_NAME
+
+
+def has_signature_method(
+    name: str, method_signatures: List[resources_pb2.MethodSignature]
+) -> bool:
+    """
+    Check if a method signature with the given name exists in the list of method signatures.
+
+    :param name: The name of the method to check.
+    :param method_signatures: List of MethodSignature objects to search in.
+    :return: True if a method with the given name exists, False otherwise.
+    """
+    return any(method_signature.name == name for method_signature in method_signatures)
 
 
 def generate_client_script(
@@ -18,12 +32,11 @@ def generate_client_script(
 ) -> str:
     url_helper = ClarifaiUrlHelper()
 
-    # Provide an mcp client config
-    if len(method_signatures) == 1 and method_signatures[0].name == "mcp_transport":
-        api_url = url_helper.api_url(
+    # Provide an mcp client config if there is a method named "mcp_transport"
+    if has_signature_method(MCP_TRANSPORT_NAME, method_signatures):
+        mcp_url = url_helper.mcp_api_url(
             user_id,
             app_id,
-            "models",
             model_id,
         )
 
@@ -33,20 +46,48 @@ import os
 from fastmcp import Client
 from fastmcp.client.transports import StreamableHttpTransport
 
-transport = StreamableHttpTransport(url="%s/mcp",
+transport = StreamableHttpTransport(url="%s",
                                     headers={"Authorization": "Bearer " + os.environ["CLARIFAI_PAT"]})
 
 async def main():
   async with Client(transport) as client:
     tools = await client.list_tools()
     print(f"Available tools: {tools}")
+    # TODO: update the dictionary of arguments passed to call_tool to make sense for your MCP.
     result = await client.call_tool(tools[0].name, {"a": 5, "b": 3})
     print(f"Result: {result[0].text}")
 
 if __name__ == "__main__":
   asyncio.run(main())
 """
-        return _CLIENT_TEMPLATE % api_url
+        return _CLIENT_TEMPLATE % mcp_url
+
+    if has_signature_method(OPENAI_TRANSPORT_NAME, method_signatures):
+        openai_api_base = url_helper.openai_api_url()
+        model_ui_url = url_helper.clarifai_url(user_id, app_id, "models", model_id)
+        _CLIENT_TEMPLATE = """
+import os
+from openai import OpenAI
+
+client = OpenAI(
+    base_url="%s",
+    api_key=os.environ['CLARIFAI_PAT'],
+)
+response = client.chat.completions.create(
+    model="%s",
+    messages=[
+        {"role": "developer", "content": "Talk like a pirate."},
+        {
+            "role": "user",
+            "content": "How do I check if a Python object is an instance of a class?",
+        },
+    ],
+    temperature=0.7,
+    stream=False, # stream=True also works, just iterator over the response
+)
+print(response)
+"""
+        return _CLIENT_TEMPLATE % (openai_api_base, model_ui_url)
 
     _CLIENT_TEMPLATE = """\
 import os

clarifai/urls/helper.py

@@ -1,15 +1,8 @@
-import os
 from collections import namedtuple
 from urllib.parse import urlparse
 
-from clarifai.utils.constants import DEFAULT_BASE, DEFAULT_UI
-
 # To help with using ClarifaiUrlHelper with defaults as ClarifaiUrlHelper()
 auth_obj = namedtuple("auth", ["ui", "base"])
-default_auth = auth_obj(
-    ui=os.environ.get("CLARIFAI_UI", DEFAULT_UI),
-    base=os.environ.get("CLARIFAI_API_BASE", DEFAULT_BASE),
-)
 
 
 class ClarifaiUrlHelper(object):
@@ -17,15 +10,19 @@ class ClarifaiUrlHelper(object):
 
     def __init__(
         self,
-        auth=default_auth,
+        auth=None,
         module_manager_imv_id: str = "module_manager_install",
     ):
         """
         Args:
-          auth: a ClarifaiAuthHelper object.
+          auth: a ClarifaiAuthHelper object. Pass None to use the values from the current context.
+          module_manager_imv_id: the ID of the module manager installed module version.
         """
         self._auth = auth
         self._module_manager_imv_id = module_manager_imv_id
+        self._current_context = None
+        if self._auth is None:
+            self._auth = auth_obj(self.current_ctx.ui, self.current_ctx.api_base)
 
     @property
     def ui(self):
@@ -35,8 +32,31 @@ class ClarifaiUrlHelper(object):
     def base(self):
         return self._auth.base
 
-    def module_ui_url(self, user_id, app_id, module_id, module_version_id):
+    @property
+    def current_ctx(self):
+        if self._current_context is None:
+            from clarifai.utils.config import Config
+
+            self._current_context = Config.from_yaml().current
+        return self._current_context
+
+    def module_ui_url(
+        self,
+        user_id: str = None,
+        app_id: str = None,
+        module_id: str = None,
+        module_version_id: str = None,
+    ):
         """This is the path to the module in community."""
+        if user_id is None:
+            user_id = self.current_ctx.user_id
+        if app_id is None:
+            app_id = self.current_ctx.app_id
+        if module_id is None:
+            module_id = self.current_ctx.module_id
+        if module_version_id is None:
+            module_version_id = self.current_ctx.module_version_id
+
         return "%s/%s/%s/modules/%s/versions/%s" % (
             self.ui,
             user_id,
@@ -45,9 +65,17 @@ class ClarifaiUrlHelper(object):
             module_version_id,
         )
 
-    def module_install_ui_url(self, dest_user_id, dest_app_id, module_url):
+    def module_install_ui_url(
+        self, dest_user_id: str = None, dest_app_id: str = None, module_url: str = None
+    ):
         """This is a url that allows for installation of the module from the community at 'module_url'
         into the destination app_id of the destination user_id."""
+        if dest_user_id is None:
+            dest_user_id = self.current_ctx.user_id
+        if dest_app_id is None:
+            dest_app_id = self.current_ctx.app_id
+        if module_url is None:
+            raise ValueError("module_url must be provided to install a module.")
         return "%s/%s/%s/installed_module_versions/%s/install?install=%s" % (
             self.ui,
             dest_user_id,
@@ -56,7 +84,14 @@ class ClarifaiUrlHelper(object):
             module_url,
         )
 
-    def imv_ui_url(self, dest_user_id, dest_app_id, imv_id):
+    def imv_ui_url(self, dest_user_id: str = None, dest_app_id: str = None, imv_id: str = None):
+        """This is the path to the resource in the UI."""
+        if dest_user_id is None:
+            dest_user_id = self.current_ctx.user_id
+        if dest_app_id is None:
+            dest_app_id = self.current_ctx.app_id
+        if imv_id is None:
+            raise ValueError("imv_id must be provided to get the IMV API URL.")
         return "%s/%s/%s/installed_module_versions/%s" % (
             self.ui,
             dest_user_id,
@@ -64,7 +99,63 @@ class ClarifaiUrlHelper(object):
             imv_id,
         )
 
-    def api_url(self, user_id, app_id, resource_type, resource_id, version_id: str = None):
+    def mcp_api_url(
+        self, user_id: str = None, app_id: str = None, model_id: str = None, version_id: str = None
+    ):
+        """We have a special endpoint for MCP hosted models.
+
+        Example:
+          https://api.clarifai.com/v2/ext/mcp/v1/users/{user_id}/apps/{app_id}/models/{model_id}/versions/{version_id}
+
+        Args:
+          user_id: the author of the resource.
+          app_id: the author's app the resource was created in.
+          model_id: the resource ID
+          version_id: the version of the resource.
+        """
+        if user_id is None:
+            user_id = self.current_ctx.user_id
+        if app_id is None:
+            app_id = self.current_ctx.app_id
+        if model_id is None:
+            model_id = self.current_ctx.model_id
+        if version_id is None:
+            return "%s/v2/ext/mcp/v1/users/%s/apps/%s/models/%s" % (
+                self.base,
+                user_id,
+                app_id,
+                model_id,
+            )
+        return "%s/v2/ext/mcp/v1/users/%s/apps/%s/models/%s/versions/%s" % (
+            self.base,
+            user_id,
+            app_id,
+            model_id,
+            version_id,
+        )
+
+    def openai_api_url(self):
+        """We have a special endpoint for openAI compatible models.
+
+        This doesn't include the /chat/completions suffix which the openAI client automatically
+        adds.
+
+        It also doesn't incldue the model which you an set as the model arg in an openAI client call
+        using the clarifai_url() method below.
+
+        Example:
+          https://api.clarifai.com/v2/ext/openai/v1
+        """
+        return "%s/v2/ext/openai/v1" % self.base
+
+    def api_url(
+        self,
+        user_id: str = None,
+        app_id: str = None,
+        resource_type: str = None,
+        resource_id: str = None,
+        version_id: str = None,
+    ):
         """This is the path to the resource in the API.
 
         Example:
@@ -81,6 +172,12 @@ class ClarifaiUrlHelper(object):
           resource_type: the type of resource. One of "modules", "models", "concepts", "inputs", "workflows", "tasks"
           resource_id: the resource ID
         """
+        if user_id is None:
+            user_id = self.current_ctx.user_id
+        if app_id is None:
+            app_id = self.current_ctx.app_id
+        if resource_id is None:
+            raise ValueError("resource_id must be provided to get the API URL.")
         self._validate_resource_type(resource_type)
         if version_id is None:
             return "%s/v2/users/%s/apps/%s/%s/%s" % (
@@ -117,7 +214,14 @@ class ClarifaiUrlHelper(object):
                 % resource_type
             )
 
-    def clarifai_url(self, user_id, app_id, resource_type, resource_id, version_id: str = None):
+    def clarifai_url(
+        self,
+        user_id: str = None,
+        app_id: str = None,
+        resource_type: str = None,
+        resource_id: str = None,
+        version_id: str = None,
+    ):
         """This is the path to the resource in community UI.
 
         Example:
@@ -135,6 +239,12 @@ class ClarifaiUrlHelper(object):
           resource_id: the resource ID
           version_id: the version of the resource.
         """
+        if user_id is None:
+            user_id = self.current_ctx.user_id
+        if app_id is None:
+            app_id = self.current_ctx.app_id
+        if resource_id is None:
+            raise ValueError("resource_id must be provided to get the API URL.")
         self._validate_resource_type(resource_type)
         if version_id is None:
             return "%s/%s/%s/%s/%s" % (self.ui, user_id, app_id, resource_type, resource_id)
@@ -148,7 +258,7 @@ class ClarifaiUrlHelper(object):
         )
 
     @classmethod
-    def split_clarifai_app_url(cls, url):
+    def split_clarifai_app_url(cls, url: str):
         """
         clarifai.com uses fully qualified urls to resources.
         They are in the format of:
@@ -166,7 +276,7 @@ class ClarifaiUrlHelper(object):
         return tuple(parts[1:])
 
     @classmethod
-    def split_clarifai_url(cls, url):
+    def split_clarifai_url(cls, url: str):
         """
         clarifai.com uses fully qualified urls to resources.
         They are in the format of:
@@ -191,7 +301,7 @@ class ClarifaiUrlHelper(object):
         return user_id, app_id, resource_type, resource_id, resource_version_id
 
     @classmethod
-    def split_module_ui_url(cls, install):
+    def split_module_ui_url(cls, install: str):
         """Takes in a path like https://clarifai.com/zeiler/app/modules/module1/versions/2 to split it apart into it's IDs.
 
         Returns:

clarifai/utils/config.py

@@ -4,7 +4,8 @@ from dataclasses import dataclass, field
 
 import yaml
 
-from clarifai.utils.constants import DEFAULT_CONFIG
+from clarifai.utils.constants import DEFAULT_BASE, DEFAULT_CONFIG, DEFAULT_UI
+from clarifai.utils.logging import logger
 
 
 class Context(OrderedDict):
@@ -23,6 +24,12 @@ class Context(OrderedDict):
             self['env'] = kwargs
 
     def __getattr__(self, key):
+        """Get the key from the config. You can pass a lowercase key like "pat" and it will check if
+        the environment variable CLARIFAI_PAT set and use that first. If no env var, then it checks
+        if that env var name is in the config and use that. If not then checks if
+        "pat" is in the config, if not then it falls back to CLARIFAI_PAT in the environment
+        variables, else raises an AttributeError.
+        """
         try:
             if key == 'name':
                 return self[key]
@@ -32,7 +39,9 @@ class Context(OrderedDict):
             # Allow accessing CLARIFAI_PAT type env var names from config as .pat
             envvar_name = 'CLARIFAI_' + key.upper()
             env = self['env']
-            if envvar_name in env:
+            if envvar_name in os.environ:  # environment variable take precedence.
+                value = os.environ[envvar_name]
+            elif envvar_name in env:
                 value = env[envvar_name]
                 if value == "ENVVAR":
                     if envvar_name not in os.environ:
@@ -40,8 +49,17 @@ class Context(OrderedDict):
                             f"Environment variable '{envvar_name}' not set. Attempting to load it for config '{self['name']}'. Please set it in your terminal."
                         )
                     return os.environ[envvar_name]
-            else:
+            elif key in env:  # check if key is in the config
                 value = env[key]
+            # below are some default fallback values for UI and API base.
+            elif envvar_name == 'CLARIFAI_UI':
+                value = DEFAULT_UI
+            elif envvar_name == 'CLARIFAI_API_BASE':
+                value = DEFAULT_BASE
+            else:
+                raise AttributeError(
+                    f"'{type(self).__name__}' object has no attribute '{key}' or '{envvar_name}' and '{envvar_name}' is also not in os.environ:"
+                )
 
             if isinstance(value, dict):
                 return Context(value)
@@ -136,8 +154,17 @@ class Config:
 
     @classmethod
     def from_yaml(cls, filename: str = DEFAULT_CONFIG):
-        with open(filename, 'r') as f:
-            cfg = yaml.safe_load(f)
+        """Loads the configuration from a YAML file.
+        If the file does not exist, it initializes with empty config.
+        """
+        cfg = {"current_context": "_empty_", "contexts": {"_empty_": {}}}
+        if os.path.exists(filename):
+            with open(filename, 'r') as f:
+                cfg = yaml.safe_load(f)
+        else:
+            logger.warning(
+                f"Config file {filename} not found, using default config. Run 'clarifai config' on the command line to create a config file."
+            )
         return cls(**cfg, filename=filename)
 
     def to_dict(self):
@@ -160,5 +187,10 @@ class Config:
 
     @property
     def current(self) -> Context:
-        """get the current Context"""
+        """Get the current Context or an empty one if your config is not setup."""
+        if not self.current_context:
+            logger.warning(
+                "No current context set, returning empty context. Run 'clarifai config' on the command line to create a config file."
+            )
+            return Context("_empty_")
         return self.contexts[self.current_context]

clarifai/utils/constants.py

@@ -3,6 +3,8 @@ import os
 DEFAULT_UI = os.environ.get("CLARIFAI_UI", "https://clarifai.com")
 DEFAULT_BASE = os.environ.get("CLARIFAI_API_BASE", "https://api.clarifai.com")
 
+MCP_TRANSPORT_NAME = "mcp_transport"
+OPENAI_TRANSPORT_NAME = "openai_transport"
 
 CLARIFAI_PAT_ENV_VAR = "CLARIFAI_PAT"
 CLARIFAI_SESSION_TOKEN_ENV_VAR = "CLARIFAI_SESSION_TOKEN"

{clarifai-11.4.5.dist-info → clarifai-11.4.7.dist-info}/METADATA

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

{clarifai-11.4.5.dist-info → clarifai-11.4.7.dist-info}/RECORD

@@ -1,14 +1,14 @@
-clarifai/__init__.py,sha256=kV7nbYrWnc8FLLQtKI_7asjBj6k3ELmICuzhSmhU4Mk,23
+clarifai/__init__.py,sha256=Bf0R_NXXlv8PTvDDZ0L1u2z4ioD_oDpofFKAfM0SnDw,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=GXa6D4v_L404J83jnRNFPH7s-1V9lk7w6Ws99f1g-AY,2772
 clarifai/versions.py,sha256=ecSuEB_nOL2XSoYHDw2n23XUbm_KPOGjudMXmQrGdS8,224
 clarifai/cli/README.md,sha256=YGApHfeUyu5P0Pdth-mqQCQftWHDxz6bugDlvDXDhOE,1942
 clarifai/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/cli/__main__.py,sha256=7nPbLW7Jr2shkgMPvnxpn4xYGMvIcnqluJ69t9w4H_k,74
-clarifai/cli/base.py,sha256=Rk87oliNs3q-pVX2ubyjycgo4Gtd0hcDSgr9MqDxyko,8227
+clarifai/cli/base.py,sha256=mzfAHRhon6tKntpxk241GD-Sjrb2-V99nAOasElLuuw,8254
 clarifai/cli/compute_cluster.py,sha256=8Xss0Obrp6l1XuxJe0luOqU_pf8vXGDRi6jyIe8qR6k,2282
 clarifai/cli/deployment.py,sha256=9C4I6_kyMxRkWl6h681wc79-3mAtDHtTUaxRv05OZMs,4262
-clarifai/cli/model.py,sha256=M1O0QCdIyTcn2GzrkROAtgWR-8SX2WV9nz0l84rkiG4,27375
+clarifai/cli/model.py,sha256=R9Bl32ELs4w658dDLeugjwf5d_3SMJiv64ciEqoWaTQ,27291
 clarifai/cli/nodepool.py,sha256=H6OIdUW_EiyDUwZogzEDoYmVwEjLMsgoDlPyE7gjIuU,4245
 clarifai/client/__init__.py,sha256=NhpNFRJY6mTi8ca-5hUeTEmYeDKHDNXY48FN63pDuos,703
 clarifai/client/app.py,sha256=D0FG9v07g1dExLnQsYt0OQjsJCkVvuw76BOpcqaCzfM,41380
@@ -18,13 +18,13 @@ clarifai/client/dataset.py,sha256=OgdpZkQ_vYmRxL8-qphcNozpvPV1bWTlte9Jv6UkKb8,35
 clarifai/client/deployment.py,sha256=QBf0tzkKBEpzNgmOEmWUJMOlVWdFEFc70Y44o8y75Gs,2875
 clarifai/client/input.py,sha256=jpX47qwn7aUBBIEuSSLHF5jk70XaWEh0prD065c9b-E,51205
 clarifai/client/lister.py,sha256=1YEm2suNxPaJO4x9V5szgD_YX6N_00vgSO-7m0HagY8,2208
-clarifai/client/model.py,sha256=XptnbfvNnaRCvv6Sdc7hfZnEPL8z9_-nFB3OmKujfAE,86267
+clarifai/client/model.py,sha256=cITBJ7J2C2FnVFtHlahcKP4ALYR45-q2y7RPjq2I2cY,85689
 clarifai/client/model_client.py,sha256=XOrrm1xOZt62eLX5KbvV-zKSpK4EJOPUTUrGnH8z_KE,22392
 clarifai/client/module.py,sha256=jLViQYvVV3FmRN_ivvbk83uwsx7CgYGeEx4dYAr6yD4,4537
 clarifai/client/nodepool.py,sha256=Y5zQ0JLdTjAp2TmVnx7AAOwaB2YUslk3nl7s6BQ90FQ,16415
 clarifai/client/runner.py,sha256=5xCiqByGGscfNm0IjHelhDTx8-9l8G0C3HL-3YZogK8,2253
 clarifai/client/search.py,sha256=3LLfATrdU43a0mRNITmJV-E53bhfafZkYsbwkTtlnyU,15661
-clarifai/client/user.py,sha256=VqY5j75wJqw1AeaWpZLvbNfSjQHGQm_bdjknDjX_fQY,18394
+clarifai/client/user.py,sha256=_G_x3P6IJqtRqI2r0HDAhSfQJmqWgEfwEVmRTOJISbw,19052
 clarifai/client/workflow.py,sha256=Bqh8lAmJcSbviJebckchTxucYlU11UQEhFSov7elpsk,13417
 clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShKJK0,136
 clarifai/client/auth/helper.py,sha256=kHBi8GTX19EUiD9n_QgCqilv127TDIpP0_o5MMtzFdY,15167
@@ -67,18 +67,18 @@ clarifai/runners/__init__.py,sha256=CQhpUOj_x-oV9xEUKdL-hi3A1BQAtPUv-FFOev4a96w,
 clarifai/runners/server.py,sha256=9qVAs8pRHmtyY0RCNIQ1uP8nqDADIFZ03LnkoDt1h4U,4692
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=5cjv7U8PmWa3DB_5B1CqSYh_6GE0E0np52TIAa7EIDE,2312
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/models/dummy_openai_model.py,sha256=nbE6ZnLDUfor9omN536jMk64ZOi5OnwJqgvI93wTKqY,7220
+clarifai/runners/models/dummy_openai_model.py,sha256=5oa7r8j1GpymenpmMfaAV9Vt6VObKvrT9tDXgFmP4qY,7208
 clarifai/runners/models/mcp_class.py,sha256=7uwCMade0LMMBq7vczhPf4Kxdmh8Rj0R7Pg3pPxYdjQ,6386
 clarifai/runners/models/model_builder.py,sha256=PiqPyTGPSKsYvOQNpBzs4e1_wuEbtE-P3yEkLE4Py10,49231
-clarifai/runners/models/model_class.py,sha256=OHVd0tMOXDyl9v1vWeHOmYGx_dvP77N4zlLGMyTakag,15575
+clarifai/runners/models/model_class.py,sha256=-euUF-eHUi4KXR_e1pIwvToDZ13CM6TSz2FolzildjM,16069
 clarifai/runners/models/model_run_locally.py,sha256=6-6WjEKc0ba3gAv4wOLdMs2XOzS3b-2bZHJS0wdVqJY,20088
 clarifai/runners/models/model_runner.py,sha256=SccX-RxTgruSpQaM21uMSl-z1x6fOa13fQZMQW8NNRY,7297
 clarifai/runners/models/model_servicer.py,sha256=rRd_fNEXwqiBSzTUtPI2r07EBdcCPd8tcSPHeqTe0_I,3445
-clarifai/runners/models/openai_class.py,sha256=bD5Th_Pgu8RRP0OsraWClDUtbrB9-bygfIBRpzWfOac,8074
+clarifai/runners/models/openai_class.py,sha256=3u6K7vTdYybxdTT3t3pYh9wvQyWhkL595t7hR5IkljU,8159
 clarifai/runners/models/visual_classifier_class.py,sha256=f9ZP8KFamMUdMpUG3AlL9nVCdcggy_E5n9RJY3ixR1U,2739
 clarifai/runners/models/visual_detector_class.py,sha256=ky4oFAkGCKPpGPdgaOso-n6D3HcmnbKee_8hBsNiV8U,2883
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/utils/code_script.py,sha256=u8rN-Av7V8ZZK61P6wu6WOFkUDjU2gc0B8Z53Y6FEWQ,11137
+clarifai/runners/utils/code_script.py,sha256=fiuwsY-uxmMzQXBv1V8Gpw0n6s_xzrigAk4J5htOAao,12646
 clarifai/runners/utils/const.py,sha256=Q4Ps6gIEJCyTdQCfmT6PaS61WHmhT25XigV1NugWz-E,1544
 clarifai/runners/utils/data_utils.py,sha256=4M4n-cGprBEBV5UkgOWaUlVfZ3WBTmegdffGQ3SfYCU,20750
 clarifai/runners/utils/loader.py,sha256=K5Y8MPbIe5STw2gDnrL8KqFgKNxEo7bz-RV0ip1T4PM,10900
@@ -89,11 +89,11 @@ clarifai/runners/utils/url_fetcher.py,sha256=Segkvi-ktPa3-koOpUu8DNZeWOaK6G82Ya9
 clarifai/runners/utils/data_types/__init__.py,sha256=iBtmPkIoLK9ew6ZiXElGt2YBBTDLEA0fmxE_eOYzvhk,478
 clarifai/runners/utils/data_types/data_types.py,sha256=UBHTNPshr94qUs2KqkYis0VlArm23rcSG_EyO_Uetgc,19823
 clarifai/schema/search.py,sha256=o9-ct8ulLZByB3RCVwZWPgaDwdcW7cM5s-g8oyAz89s,2421
-clarifai/urls/helper.py,sha256=UshKiEnBAZfMyoWiM3Xx6USXEYmXRFTd4kNpuQSQQM8,7868
+clarifai/urls/helper.py,sha256=z6LnLGgLHxD8scFtyRdxqYIRJNhxqPkfLe53UtTLUBY,11727
 clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/utils/cli.py,sha256=7lHajIsWzyEU7jfgH1nykwYG63wcHCZ3ep7a6amWZH4,5413
-clarifai/utils/config.py,sha256=AguQ4UPFxNwDT8hTBrdV4grQ0t4m-pW2V9XKxBWfnNg,5177
-clarifai/utils/constants.py,sha256=RYfDVFpaW7V5ISIvY7uvu5nqTvQ2NEwFOd0dcCytyGk,2030
+clarifai/utils/config.py,sha256=jMSWYxJfp_D8eoGqz-HTdsngn5bg_1ymjLidYz6rdLA,7073
+clarifai/utils/constants.py,sha256=nvKNAOnfvHza03mYHVLfyOfm_AcFiNKr2CzwyEQgoQI,2110
 clarifai/utils/logging.py,sha256=0we53uTqUvzrulC86whu-oeWNxn1JjJL0OQ98Bwf9vo,15198
 clarifai/utils/misc.py,sha256=x7JP8oxU672Z9yAav47Y1anFiL4RD8WvlKBHMVlbyZM,3137
 clarifai/utils/model_train.py,sha256=0XSAoTkSsrwf4f-W9yw2mkXZtkal7LBLJSoi86CFCn4,9250
@@ -106,9 +106,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=Oq3RVNKvv1iH46U6oIjXa-MXWJ4sTlXr_NSfwoxr3H4,2149
 clarifai/workflows/utils.py,sha256=ESL3INcouNcLKCh-nMpfXX-YbtCzX7tz7hT57_RGQ3M,2079
 clarifai/workflows/validate.py,sha256=UhmukyHkfxiMFrPPeBdUTiCOHQT5-shqivlBYEyKTlU,2931
-clarifai-11.4.5.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.4.5.dist-info/METADATA,sha256=5wUGZgaAVSm1sGoBaaBp8Lq6shX5SrkHuYkAhSND000,22398
-clarifai-11.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-clarifai-11.4.5.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.4.5.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.4.5.dist-info/RECORD,,
+clarifai-11.4.7.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.4.7.dist-info/METADATA,sha256=bnOYR9voVtpCEE1ig6qeV98EUThXwa1k6oomoY91Kt8,22398
+clarifai-11.4.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+clarifai-11.4.7.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.4.7.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.4.7.dist-info/RECORD,,