clarifai 11.5.3rc2__tar.gz → 11.5.4__tar.gz

{clarifai-11.5.3rc2/clarifai.egg-info → clarifai-11.5.4}/PKG-INFO

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

clarifai-11.5.4/clarifai/__init__.py

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

{clarifai-11.5.3rc2 → clarifai-11.5.4}/clarifai/runners/models/model_runner.py

@@ -5,6 +5,8 @@ from clarifai_grpc.grpc.api.status import status_code_pb2, status_pb2
 from clarifai_protocol import BaseRunner
 from clarifai_protocol.utils.health import HealthProbeRequestHandler
 
+from clarifai.client.auth.helper import ClarifaiAuthHelper
+
 from ..utils.url_fetcher import ensure_urls_downloaded
 from .model_class import ModelClass
 
@@ -42,6 +44,28 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
         )
         self.model = model
 
+        # Store authentication parameters for URL fetching
+        self._user_id = user_id
+        self._pat = pat
+        self._token = token
+        self._base_url = base_url
+
+        # Create auth helper if we have sufficient authentication information
+        self._auth_helper = None
+        if self._user_id and (self._pat or self._token):
+            try:
+                self._auth_helper = ClarifaiAuthHelper(
+                    user_id=self._user_id,
+                    app_id="",  # app_id not needed for URL fetching
+                    pat=self._pat or "",
+                    token=self._token or "",
+                    base=self._base_url,
+                    validate=False,  # Don't validate since app_id is empty
+                )
+            except Exception:
+                # If auth helper creation fails, proceed without authentication
+                self._auth_helper = None
+
         # After model load successfully set the health probe to ready and startup
         HealthProbeRequestHandler.is_ready = True
         HealthProbeRequestHandler.is_startup = True
@@ -81,7 +105,7 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
         if not runner_item.HasField('post_model_outputs_request'):
             raise Exception("Unexpected work item type: {}".format(runner_item))
         request = runner_item.post_model_outputs_request
-        ensure_urls_downloaded(request)
+        ensure_urls_downloaded(request, auth_helper=self._auth_helper)
 
         resp = self.model.predict_wrapper(request)
         if resp.status.code != status_code_pb2.SUCCESS:
@@ -114,7 +138,7 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
         if not runner_item.HasField('post_model_outputs_request'):
             raise Exception("Unexpected work item type: {}".format(runner_item))
         request = runner_item.post_model_outputs_request
-        ensure_urls_downloaded(request)
+        ensure_urls_downloaded(request, auth_helper=self._auth_helper)
 
         for resp in self.model.generate_wrapper(request):
             if resp.status.code != status_code_pb2.SUCCESS:
@@ -150,7 +174,9 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
         self, runner_item_iterator: Iterator[service_pb2.RunnerItem]
     ) -> Iterator[service_pb2.RunnerItemOutput]:
         # Call the generate() method the underlying model implements.
-        for resp in self.model.stream_wrapper(pmo_iterator(runner_item_iterator)):
+        for resp in self.model.stream_wrapper(
+            pmo_iterator(runner_item_iterator, self._auth_helper)
+        ):
             if resp.status.code != status_code_pb2.SUCCESS:
                 yield service_pb2.RunnerItemOutput(multi_output_response=resp)
                 continue
@@ -181,9 +207,9 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
             yield service_pb2.RunnerItemOutput(multi_output_response=resp)
 
 
-def pmo_iterator(runner_item_iterator):
+def pmo_iterator(runner_item_iterator, auth_helper=None):
     for runner_item in runner_item_iterator:
         if not runner_item.HasField('post_model_outputs_request'):
             raise Exception("Unexpected work item type: {}".format(runner_item))
-        ensure_urls_downloaded(runner_item.post_model_outputs_request)
+        ensure_urls_downloaded(runner_item.post_model_outputs_request, auth_helper=auth_helper)
         yield runner_item.post_model_outputs_request

{clarifai-11.5.3rc2 → clarifai-11.5.4}/clarifai/runners/models/model_servicer.py

@@ -5,6 +5,8 @@ from typing import Iterator
 from clarifai_grpc.grpc.api import service_pb2, service_pb2_grpc
 from clarifai_grpc.grpc.api.status import status_code_pb2, status_pb2
 
+from clarifai.client.auth.helper import ClarifaiAuthHelper
+
 from ..utils.url_fetcher import ensure_urls_downloaded
 
 _RAISE_EXCEPTIONS = os.getenv("RAISE_EXCEPTIONS", "false").lower() in ("true", "1")
@@ -23,6 +25,27 @@ class ModelServicer(service_pb2_grpc.V2Servicer):
         """
         self.model = model
 
+        # Try to create auth helper from environment variables if available
+        self._auth_helper = None
+        try:
+            user_id = os.environ.get("CLARIFAI_USER_ID")
+            pat = os.environ.get("CLARIFAI_PAT")
+            token = os.environ.get("CLARIFAI_SESSION_TOKEN")
+            base_url = os.environ.get("CLARIFAI_API_BASE", "https://api.clarifai.com")
+
+            if user_id and (pat or token):
+                self._auth_helper = ClarifaiAuthHelper(
+                    user_id=user_id,
+                    app_id="",  # app_id not needed for URL fetching
+                    pat=pat or "",
+                    token=token or "",
+                    base=base_url,
+                    validate=False,  # Don't validate since app_id is empty
+                )
+        except Exception:
+            # If auth helper creation fails, proceed without authentication
+            self._auth_helper = None
+
     def PostModelOutputs(
         self, request: service_pb2.PostModelOutputsRequest, context=None
     ) -> service_pb2.MultiOutputResponse:
@@ -32,7 +55,7 @@ class ModelServicer(service_pb2_grpc.V2Servicer):
         """
 
         # Download any urls that are not already bytes.
-        ensure_urls_downloaded(request)
+        ensure_urls_downloaded(request, auth_helper=self._auth_helper)
 
         try:
             return self.model.predict_wrapper(request)
@@ -56,7 +79,7 @@ class ModelServicer(service_pb2_grpc.V2Servicer):
         returns an output.
         """
         # Download any urls that are not already bytes.
-        ensure_urls_downloaded(request)
+        ensure_urls_downloaded(request, auth_helper=self._auth_helper)
 
         try:
             yield from self.model.generate_wrapper(request)
@@ -84,7 +107,7 @@ class ModelServicer(service_pb2_grpc.V2Servicer):
 
         # Download any urls that are not already bytes.
         for req in request:
-            ensure_urls_downloaded(req)
+            ensure_urls_downloaded(req, auth_helper=self._auth_helper)
 
         try:
             yield from self.model.stream_wrapper(request_copy)

{clarifai-11.5.3rc2 → clarifai-11.5.4}/clarifai/runners/utils/data_types/data_types.py

@@ -174,13 +174,10 @@ class Text(MessageData):
 
 
 class Concept(MessageData):
-    def __init__(self, name: str, value: float = 1.0, id: str = None,
-                 user_id: str = None, app_id: str = None):
+    def __init__(self, name: str, value: float = 1.0, id: str = None):
         self.name = name
         self.value = value
         self.id = id or Concept._concept_name_to_id(name)
-        self.user_id = user_id
-        self.app_id = app_id
 
     @staticmethod
     def _concept_name_to_id(name: str):
@@ -189,14 +186,14 @@ class Concept(MessageData):
         return _name
 
     def __repr__(self) -> str:
-        return f"Concept(id={self.id!r}, name={self.name!r}, value={self.value!r}, user_id={self.user_id!r}, app_id={self.app_id!r})"
+        return f"Concept(id={self.id!r}, name={self.name!r}, value={self.value})"
 
     def to_proto(self):
-        return ConceptProto(id=self.id, name=self.name, value=self.value, user_id=self.user_id, app_id=self.app_id)
+        return ConceptProto(id=self.id, name=self.name, value=self.value)
 
     @classmethod
     def from_proto(cls, proto: ConceptProto) -> "Concept":
-        return cls(id=proto.id, name=proto.name, value=proto.value, user_id=proto.user_id, app_id=proto.app_id)
+        return cls(id=proto.id, name=proto.name, value=proto.value)
 
 
 class Region(MessageData):
@@ -210,7 +207,6 @@ class Region(MessageData):
         track_id: str = None,
         text: str = None,
         id: str = None,
-        value: float = None,
     ):
         if proto_region is None:
             self.proto = RegionProto()
@@ -227,8 +223,6 @@ class Region(MessageData):
                 self.track_id = track_id
             if text:
                 self.text = text
-            if value:
-                self.value = value
             self.id = id if id is not None else uuid.uuid4().hex
         elif isinstance(proto_region, RegionProto):
             self.proto = proto_region
@@ -328,19 +322,8 @@ class Region(MessageData):
         point_proto = PointProto(col=x, row=y, z=z)
         self.proto.region_info.point.CopyFrom(point_proto)
 
-    @property
-    def value(self) -> float:
-        """Value of the region, typically used for confidence scores."""
-        return self.proto.value
-
-    @value.setter
-    def value(self, value: float):
-        if not isinstance(value, (int, float)):
-            raise TypeError(f"Expected int or float for value, got {type(value).__name__}")
-        self.proto.value = float(value)
-
     def __repr__(self) -> str:
-        return f"Region(id={self.id},box={self.box or []}, concepts={self.concepts or None}, point={self.point or None}, mask={self.mask or None}, track_id={self.track_id or None}, value={self.value or None})"
+        return f"Region(id={self.id},box={self.box or []}, concepts={self.concepts or None}, point={self.point or None}, mask={self.mask or None}, track_id={self.track_id or None})"
 
     def to_proto(self) -> RegionProto:
         return self.proto

clarifai-11.5.4/clarifai/runners/utils/url_fetcher.py

@@ -0,0 +1,94 @@
+import concurrent.futures
+
+import fsspec
+
+from clarifai.utils.logging import logger
+
+
+def download_input(input, auth_helper=None):
+    _download_input_data(input.data, auth_helper=auth_helper)
+    if input.data.parts:
+        for i in range(len(input.data.parts)):
+            _download_input_data(input.data.parts[i].data, auth_helper=auth_helper)
+
+
+def _download_input_data(input_data, auth_helper=None):
+    """
+    This function will download any urls that are not already bytes.
+
+    Args:
+        input_data: The input data containing URLs to download
+        auth_helper: Optional ClarifaiAuthHelper instance for authentication
+    """
+    # Get auth headers if auth_helper is provided
+    auth_kwargs = {}
+    if auth_helper is not None:
+        auth_kwargs = _get_auth_kwargs(auth_helper)
+
+    if input_data.image.url and not input_data.image.base64:
+        # Download the image
+        with fsspec.open(input_data.image.url, 'rb', **auth_kwargs) as f:
+            input_data.image.base64 = f.read()
+    if input_data.video.url and not input_data.video.base64:
+        # Download the video
+        with fsspec.open(input_data.video.url, 'rb', **auth_kwargs) as f:
+            input_data.video.base64 = f.read()
+    if input_data.audio.url and not input_data.audio.base64:
+        # Download the audio
+        with fsspec.open(input_data.audio.url, 'rb', **auth_kwargs) as f:
+            input_data.audio.base64 = f.read()
+    if input_data.text.url and not input_data.text.raw:
+        # Download the text
+        with fsspec.open(input_data.text.url, 'r', **auth_kwargs) as f:
+            input_data.text.raw = f.read()
+
+
+def _get_auth_kwargs(auth_helper):
+    """
+    Convert ClarifaiAuthHelper metadata to fsspec-compatible kwargs.
+
+    Args:
+        auth_helper: ClarifaiAuthHelper instance
+
+    Returns:
+        dict: kwargs to pass to fsspec.open() for authentication
+    """
+    if auth_helper is None:
+        return {}
+
+    try:
+        # Get authentication metadata from the helper
+        metadata = auth_helper.metadata
+
+        # Convert gRPC metadata tuples to HTTP headers dict
+        headers = {}
+        for key, value in metadata:
+            # Skip non-auth headers
+            if key in ('authorization', 'x-clarifai-session-token'):
+                headers[key] = value
+
+        # Return fsspec-compatible kwargs
+        return {'client_kwargs': {'headers': headers}}
+    except Exception as e:
+        logger.warning(f"Failed to get authentication headers: {e}")
+        return {}
+
+
+def ensure_urls_downloaded(request, max_threads=128, auth_helper=None):
+    """
+    This function will download any urls that are not already bytes and parallelize with a thread pool.
+
+    Args:
+        request: The request containing inputs with URLs to download
+        max_threads: Maximum number of threads to use for parallel downloads
+        auth_helper: Optional ClarifaiAuthHelper instance for authentication
+    """
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max_threads) as executor:
+        futures = []
+        for input in request.inputs:
+            futures.append(executor.submit(download_input, input, auth_helper))
+        for future in concurrent.futures.as_completed(futures):
+            try:
+                future.result()
+            except Exception as e:
+                logger.exception(f"Error downloading input: {e}")

{clarifai-11.5.3rc2 → clarifai-11.5.4/clarifai.egg-info}/PKG-INFO

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

clarifai-11.5.4/clarifai.egg-info/SOURCES.txt

@@ -0,0 +1,145 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+requirements.txt
+setup.py
+clarifai/__init__.py
+clarifai/cli.py
+clarifai/errors.py
+clarifai/versions.py
+clarifai.egg-info/PKG-INFO
+clarifai.egg-info/SOURCES.txt
+clarifai.egg-info/dependency_links.txt
+clarifai.egg-info/entry_points.txt
+clarifai.egg-info/requires.txt
+clarifai.egg-info/top_level.txt
+clarifai/cli/README.md
+clarifai/cli/__init__.py
+clarifai/cli/__main__.py
+clarifai/cli/base.py
+clarifai/cli/compute_cluster.py
+clarifai/cli/deployment.py
+clarifai/cli/model.py
+clarifai/cli/nodepool.py
+clarifai/cli/pipeline.py
+clarifai/cli/pipeline_step.py
+clarifai/cli/templates/__init__.py
+clarifai/cli/templates/model_templates.py
+clarifai/cli/templates/pipeline_step_templates.py
+clarifai/cli/templates/pipeline_templates.py
+clarifai/client/__init__.py
+clarifai/client/app.py
+clarifai/client/base.py
+clarifai/client/compute_cluster.py
+clarifai/client/dataset.py
+clarifai/client/deployment.py
+clarifai/client/input.py
+clarifai/client/lister.py
+clarifai/client/model.py
+clarifai/client/model_client.py
+clarifai/client/module.py
+clarifai/client/nodepool.py
+clarifai/client/runner.py
+clarifai/client/search.py
+clarifai/client/user.py
+clarifai/client/workflow.py
+clarifai/client/auth/__init__.py
+clarifai/client/auth/helper.py
+clarifai/client/auth/register.py
+clarifai/client/auth/stub.py
+clarifai/constants/base.py
+clarifai/constants/dataset.py
+clarifai/constants/input.py
+clarifai/constants/model.py
+clarifai/constants/rag.py
+clarifai/constants/search.py
+clarifai/constants/workflow.py
+clarifai/datasets/__init__.py
+clarifai/datasets/export/__init__.py
+clarifai/datasets/export/inputs_annotations.py
+clarifai/datasets/upload/__init__.py
+clarifai/datasets/upload/base.py
+clarifai/datasets/upload/features.py
+clarifai/datasets/upload/image.py
+clarifai/datasets/upload/multimodal.py
+clarifai/datasets/upload/text.py
+clarifai/datasets/upload/utils.py
+clarifai/datasets/upload/loaders/README.md
+clarifai/datasets/upload/loaders/__init__.py
+clarifai/datasets/upload/loaders/coco_captions.py
+clarifai/datasets/upload/loaders/coco_detection.py
+clarifai/datasets/upload/loaders/imagenet_classification.py
+clarifai/datasets/upload/loaders/xview_detection.py
+clarifai/models/__init__.py
+clarifai/models/api.py
+clarifai/modules/README.md
+clarifai/modules/__init__.py
+clarifai/modules/css.py
+clarifai/modules/pages.py
+clarifai/modules/style.css
+clarifai/rag/__init__.py
+clarifai/rag/rag.py
+clarifai/rag/utils.py
+clarifai/runners/__init__.py
+clarifai/runners/server.py
+clarifai/runners/dockerfile_template/Dockerfile.template
+clarifai/runners/models/__init__.py
+clarifai/runners/models/dummy_openai_model.py
+clarifai/runners/models/mcp_class.py
+clarifai/runners/models/model_builder.py
+clarifai/runners/models/model_class.py
+clarifai/runners/models/model_run_locally.py
+clarifai/runners/models/model_runner.py
+clarifai/runners/models/model_servicer.py
+clarifai/runners/models/openai_class.py
+clarifai/runners/models/visual_classifier_class.py
+clarifai/runners/models/visual_detector_class.py
+clarifai/runners/pipeline_steps/__init__.py
+clarifai/runners/pipeline_steps/pipeline_step_builder.py
+clarifai/runners/pipelines/__init__.py
+clarifai/runners/pipelines/pipeline_builder.py
+clarifai/runners/utils/__init__.py
+clarifai/runners/utils/code_script.py
+clarifai/runners/utils/const.py
+clarifai/runners/utils/data_utils.py
+clarifai/runners/utils/loader.py
+clarifai/runners/utils/method_signatures.py
+clarifai/runners/utils/model_utils.py
+clarifai/runners/utils/openai_convertor.py
+clarifai/runners/utils/pipeline_validation.py
+clarifai/runners/utils/serializers.py
+clarifai/runners/utils/url_fetcher.py
+clarifai/runners/utils/data_types/__init__.py
+clarifai/runners/utils/data_types/data_types.py
+clarifai/schema/search.py
+clarifai/urls/helper.py
+clarifai/utils/__init__.py
+clarifai/utils/cli.py
+clarifai/utils/config.py
+clarifai/utils/constants.py
+clarifai/utils/logging.py
+clarifai/utils/misc.py
+clarifai/utils/model_train.py
+clarifai/utils/protobuf.py
+clarifai/utils/evaluation/__init__.py
+clarifai/utils/evaluation/helpers.py
+clarifai/utils/evaluation/main.py
+clarifai/utils/evaluation/testset_annotation_parser.py
+clarifai/workflows/__init__.py
+clarifai/workflows/export.py
+clarifai/workflows/utils.py
+clarifai/workflows/validate.py
+tests/test_app.py
+tests/test_async_stub.py
+tests/test_auth.py
+tests/test_data_upload.py
+tests/test_eval.py
+tests/test_list_models.py
+tests/test_misc.py
+tests/test_model_predict.py
+tests/test_model_train.py
+tests/test_modules.py
+tests/test_rag.py
+tests/test_search.py
+tests/test_stub.py

clarifai-11.5.3rc2/clarifai/__init__.py

@@ -1 +0,0 @@
-__version__ = "11.5.3rc2"