clarifai 11.6.1__tar.gz → 11.6.3__tar.gz

{clarifai-11.6.1/clarifai.egg-info → clarifai-11.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.6.1
+Version: 11.6.3
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com
@@ -19,7 +19,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.6.0
+Requires-Dist: clarifai-grpc>=11.6.1
 Requires-Dist: clarifai-protocol>=0.0.25
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0

clarifai-11.6.3/clarifai/__init__.py

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

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai/cli/model.py

@@ -17,10 +17,7 @@ from clarifai.utils.constants import (
     DEFAULT_LOCAL_DEV_NODEPOOL_ID,
 )
 from clarifai.utils.logging import logger
-from clarifai.utils.misc import (
-    clone_github_repo,
-    format_github_repo_url,
-)
+from clarifai.utils.misc import clone_github_repo, format_github_repo_url
 
 
 @cli.group(
@@ -60,7 +57,12 @@ def model():
     required=False,
     help='Git branch to clone from the GitHub repository. If not specified, the default branch will be used.',
 )
-def init(model_path, model_type_id, github_pat, github_repo, branch):
+@click.option(
+    '--local-ollama-model',
+    is_flag=True,
+    help='Create an Ollama model template by cloning from GitHub repository.',
+)
+def init(model_path, model_type_id, github_pat, github_repo, branch, local_ollama_model):
     """Initialize a new model directory structure.
 
     Creates the following structure in the specified directory:
@@ -76,6 +78,15 @@ def init(model_path, model_type_id, github_pat, github_repo, branch):
 
     MODEL_PATH: Path where to create the model directory structure. If not specified, the current directory is used by default.
     """
+    # Handle the --local-ollama-model flag
+    if local_ollama_model:
+        if github_repo or branch:
+            raise click.ClickException(
+                "Cannot specify both --local-ollama-model and --github-repo/--branch"
+            )
+        github_repo = "https://github.com/Clarifai/runners-examples"
+        branch = "ollama"
+
     # Resolve the absolute path
     model_path = os.path.abspath(model_path)
 
@@ -407,8 +418,16 @@ def run_locally(model_path, port, mode, keep_env, keep_image, skip_dockerfile=Fa
     required=False,
     default=".",
 )
+@click.option(
+    "--pool_size",
+    type=int,
+    is_flag=True,
+    default=1,  # default to 1 thread for local dev runner to avoid rapid depletion of compute time.
+    show_default=True,
+    help="The number of threads to use. On community plan, the compute time allocation is drained at a rate proportional to the number of threads.",
+)  # pylint: disable=range-builtin-not-iterating
 @click.pass_context
-def local_dev(ctx, model_path):
+def local_dev(ctx, model_path, pool_size):
     """Run the model as a local dev runner to help debug your model connected to the API or to
     leverage local compute resources manually. This relies on many variables being present in the env
     of the currently selected context. If they are not present then default values will be used to
@@ -731,6 +750,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     # This reads the config.yaml from the model_path so we alter it above first.
     serve(
         model_path,
+        pool_size=pool_size,
+        num_threads=pool_size,
         user_id=user_id,
         compute_cluster_id=compute_cluster_id,
         nodepool_id=nodepool_id,

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai/cli/templates/model_templates.py

@@ -7,7 +7,7 @@ def get_model_class_template() -> str:
     """Return the template for a basic ModelClass-based model."""
     return '''from typing import Iterator, List
 from clarifai.runners.models.model_class import ModelClass
-from clarifai.runners.util.data_utils import Param
+from clarifai.runners.utils.data_utils import Param
 
 class MyModel(ModelClass):
     """A custom model implementation using ModelClass."""
@@ -31,7 +31,7 @@ class MyModel(ModelClass):
         """This is the method that will be called when the runner is run. It takes in an input and returns an output."""
         # TODO: please fill in
         # Implement your prediction logic here
-        pass  # Replace with your actual logic
+        return "This is a placeholder response. Please implement your model logic."
 
     @ModelClass.method
     def generate(
@@ -45,7 +45,7 @@ class MyModel(ModelClass):
         """Example yielding a streamed response."""
         # TODO: please fill in
         # Implement your generation logic here
-        pass # Replace with your actual logic
+        yield "This is a placeholder response. Please implement your model logic."
 '''
 
 
@@ -104,7 +104,7 @@ def get_openai_model_class_template() -> str:
     return '''from typing import List
 from openai import OpenAI
 from clarifai.runners.models.openai_class import OpenAIModelClass
-from clarifai.runners.util.data_utils import Param
+from clarifai.runners.utils.data_utils import Param
 from clarifai.runners.utils.openai_convertor import build_openai_messages
 
 class MyModel(OpenAIModelClass):

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai/runners/pipeline_steps/pipeline_step_builder.py

@@ -8,6 +8,7 @@ from string import Template
 import yaml
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
 from clarifai_grpc.grpc.api.status import status_code_pb2
+from google.protobuf import json_format
 
 from clarifai.client.base import BaseClient
 from clarifai.utils.logging import logger
@@ -106,16 +107,16 @@ class PipelineStepBuilder:
 
     def _get_pipeline_step_compute_info(self):
         """Get pipeline step compute info from config."""
+        assert "pipeline_step_compute_info" in self.config, (
+            "pipeline_step_compute_info not found in the config file"
+        )
         compute_config = self.config.get("pipeline_step_compute_info", {})
 
-        compute_info = resources_pb2.ComputeInfo()
+        # Ensure cpu_limit is a string if it exists and is an int
+        if 'cpu_limit' in compute_config and isinstance(compute_config['cpu_limit'], int):
+            compute_config['cpu_limit'] = str(compute_config['cpu_limit'])
 
-        if "cpu_limit" in compute_config:
-            compute_info.cpu_limit = compute_config["cpu_limit"]
-        if "cpu_memory" in compute_config:
-            compute_info.cpu_memory = compute_config["cpu_memory"]
-        if "num_accelerators" in compute_config:
-            compute_info.num_accelerators = compute_config["num_accelerators"]
+        compute_info = json_format.ParseDict(compute_config, resources_pb2.ComputeInfo())
 
         return compute_info
 
@@ -200,8 +201,11 @@ COPY --link=true requirements.txt config.yaml /home/nonroot/main/
             PYTHON_VERSION=python_version
         )
 
-        # Write Dockerfile
+        # Write Dockerfile if it doesn't exist
         dockerfile_path = os.path.join(self.folder, 'Dockerfile')
+        if os.path.exists(dockerfile_path):
+            logger.info(f"Dockerfile already exists at {dockerfile_path}, skipping creation.")
+            return
         with open(dockerfile_path, 'w') as dockerfile:
             dockerfile.write(dockerfile_content)
 

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai/runners/server.py

@@ -81,6 +81,7 @@ def serve(
     model_path,
     port=8000,
     pool_size=32,
+    num_threads=0,
     max_queue_size=10,
     max_msg_length=1024 * 1024 * 1024,
     enable_tls=False,
@@ -98,7 +99,8 @@ def serve(
 
     # `num_threads` can be set in config.yaml or via the environment variable CLARIFAI_NUM_THREADS="<integer>".
     # Note: The value in config.yaml takes precedence over the environment variable.
-    num_threads = builder.config.get("num_threads")
+    if num_threads == 0:
+        num_threads = builder.config.get("num_threads")
     # Setup the grpc server for local development.
     if grpc:
         # initialize the servicer with the runner so that it gets the predict(), generate(), stream() classes.

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai/utils/constants.py

@@ -47,7 +47,7 @@ DEFAULT_LOCAL_DEV_NODEPOOL_CONFIG = {
         },
         "instance_types": [
             {
-                "id": "local-cpu",
+                "id": "local",
                 "compute_info": {
                     "cpu_limit": str(os.cpu_count()),
                     "cpu_memory": "16Gi",  # made up as we don't schedule based on this for local dev.

{clarifai-11.6.1 → clarifai-11.6.3/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.6.1
+Version: 11.6.3
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com
@@ -19,7 +19,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.6.0
+Requires-Dist: clarifai-grpc>=11.6.1
 Requires-Dist: clarifai-protocol>=0.0.25
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0

{clarifai-11.6.1 → clarifai-11.6.3}/clarifai.egg-info/requires.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=11.6.0
+clarifai-grpc>=11.6.1
 clarifai-protocol>=0.0.25
 numpy>=1.22.0
 tqdm>=4.65.0

{clarifai-11.6.1 → clarifai-11.6.3}/requirements.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=11.6.0
+clarifai-grpc>=11.6.1
 clarifai-protocol>=0.0.25
 numpy>=1.22.0
 tqdm>=4.65.0

clarifai-11.6.1/clarifai/__init__.py

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