clarifai 10.9.2__tar.gz → 10.9.5__tar.gz

{clarifai-10.9.2/clarifai.egg-info → clarifai-10.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.9.2
+Version: 10.9.5
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=10.9.4
+Requires-Dist: clarifai-grpc>=10.9.11
 Requires-Dist: clarifai-protocol>=0.0.6
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
@@ -33,15 +33,17 @@ Requires-Dist: inquirerpy==0.3.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: protobuf==5.27.3
 Requires-Dist: fsspec==2024.6.1
+Requires-Dist: click==8.1.7
 Provides-Extra: all
 Requires-Dist: pycocotools==2.0.6; extra == "all"
 
 <h1 align="center">
-  <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://upload.wikimedia.org/wikipedia/commons/b/bc/Clarifai_Logo_FC_Web.png"></a>
+  <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://github.com/user-attachments/assets/623b883b-7fe5-4b95-bbfa-8691f5779af4"></a>
 </h1>
 
+
 <h2 align="center">
-Clarifai Python SDK</a>
+Clarifai Python SDK
 </h2>
 
 
@@ -51,6 +53,8 @@ Clarifai Python SDK</a>
   </a>
   <a href="https://pypi.org/project/clarifai" target="_blank"> <img src="https://img.shields.io/pypi/dm/clarifai" alt="PyPI - Downloads">
   </a>
+  <a href="https://img.shields.io/pypi/pyversions/clarifai" target="_blank"> <img src="https://img.shields.io/pypi/pyversions/clarifai" alt="PyPI - Versions">
+  </a>
 </p>
 
 
@@ -261,19 +265,19 @@ print(gpt_4_model)
 
 
 # Model Predict
-model_prediction = Model("https://clarifai.com/anthropic/completion/models/claude-v2").predict_by_bytes(b"Write a tweet on future of AI", input_type="text")
+model_prediction = Model("https://clarifai.com/anthropic/completion/models/claude-v2").predict_by_bytes(b"Write a tweet on future of AI")
 
 # Customizing Model Inference Output
-model_prediction = gpt_4_model.predict_by_bytes(b"Write a tweet on future of AI", "text", inference_params=dict(temperature=str(0.7), max_tokens=30))
+model_prediction = gpt_4_model.predict_by_bytes(b"Write a tweet on future of AI", inference_params=dict(temperature=str(0.7), max_tokens=30))
 # Return predictions having prediction confidence > 0.98
-model_prediction = model.predict_by_filepath(filepath="local_filepath", input_type, output_config={"min_value": 0.98}) # Supports image, text, audio, video
+model_prediction = model.predict_by_filepath(filepath="local_filepath", output_config={"min_value": 0.98}) # Supports image, text, audio, video
 
 # Supports prediction by url
-model_prediction = model.predict_by_url(url="url", input_type) # Supports image, text, audio, video
+model_prediction = model.predict_by_url(url="url") # Supports image, text, audio, video
 
 # Return predictions for specified interval of video
 video_input_proto = [input_obj.get_input_from_url("Input_id", video_url=BEER_VIDEO_URL)]
-model_prediction = model.predict(video_input_proto, input_type="video", output_config={"sample_ms": 2000})
+model_prediction = model.predict(video_input_proto, output_config={"sample_ms": 2000})
 ```
 #### Model Training
 ```python
@@ -383,12 +387,12 @@ from clarifai.client.workflow import Workflow
 
 # Workflow Predict
 workflow = Workflow("workflow_url") # Example: https://clarifai.com/clarifai/main/workflows/Face-Sentiment
-workflow_prediction = workflow.predict_by_url(url="url", input_type="image") # Supports image, text, audio, video
+workflow_prediction = workflow.predict_by_url(url="url") # Supports image, text, audio, video
 
 # Customizing Workflow Inference Output
 workflow = Workflow(user_id="user_id", app_id="app_id", workflow_id="workflow_id",
                   output_config={"min_value": 0.98}) # Return predictions having prediction confidence > 0.98
-workflow_prediction = workflow.predict_by_filepath(filepath="local_filepath", input_type="text") # Supports image, text, audio, video
+workflow_prediction = workflow.predict_by_filepath(filepath="local_filepath") # Supports image, text, audio, video
 ```
 
 #### Workflows Listing

{clarifai-10.9.2 → clarifai-10.9.5}/README.md

@@ -1,9 +1,10 @@
 <h1 align="center">
-  <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://upload.wikimedia.org/wikipedia/commons/b/bc/Clarifai_Logo_FC_Web.png"></a>
+  <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://github.com/user-attachments/assets/623b883b-7fe5-4b95-bbfa-8691f5779af4"></a>
 </h1>
 
+
 <h2 align="center">
-Clarifai Python SDK</a>
+Clarifai Python SDK
 </h2>
 
 
@@ -13,6 +14,8 @@ Clarifai Python SDK</a>
   </a>
   <a href="https://pypi.org/project/clarifai" target="_blank"> <img src="https://img.shields.io/pypi/dm/clarifai" alt="PyPI - Downloads">
   </a>
+  <a href="https://img.shields.io/pypi/pyversions/clarifai" target="_blank"> <img src="https://img.shields.io/pypi/pyversions/clarifai" alt="PyPI - Versions">
+  </a>
 </p>
 
 
@@ -223,19 +226,19 @@ print(gpt_4_model)
 
 
 # Model Predict
-model_prediction = Model("https://clarifai.com/anthropic/completion/models/claude-v2").predict_by_bytes(b"Write a tweet on future of AI", input_type="text")
+model_prediction = Model("https://clarifai.com/anthropic/completion/models/claude-v2").predict_by_bytes(b"Write a tweet on future of AI")
 
 # Customizing Model Inference Output
-model_prediction = gpt_4_model.predict_by_bytes(b"Write a tweet on future of AI", "text", inference_params=dict(temperature=str(0.7), max_tokens=30))
+model_prediction = gpt_4_model.predict_by_bytes(b"Write a tweet on future of AI", inference_params=dict(temperature=str(0.7), max_tokens=30))
 # Return predictions having prediction confidence > 0.98
-model_prediction = model.predict_by_filepath(filepath="local_filepath", input_type, output_config={"min_value": 0.98}) # Supports image, text, audio, video
+model_prediction = model.predict_by_filepath(filepath="local_filepath", output_config={"min_value": 0.98}) # Supports image, text, audio, video
 
 # Supports prediction by url
-model_prediction = model.predict_by_url(url="url", input_type) # Supports image, text, audio, video
+model_prediction = model.predict_by_url(url="url") # Supports image, text, audio, video
 
 # Return predictions for specified interval of video
 video_input_proto = [input_obj.get_input_from_url("Input_id", video_url=BEER_VIDEO_URL)]
-model_prediction = model.predict(video_input_proto, input_type="video", output_config={"sample_ms": 2000})
+model_prediction = model.predict(video_input_proto, output_config={"sample_ms": 2000})
 ```
 #### Model Training
 ```python
@@ -345,12 +348,12 @@ from clarifai.client.workflow import Workflow
 
 # Workflow Predict
 workflow = Workflow("workflow_url") # Example: https://clarifai.com/clarifai/main/workflows/Face-Sentiment
-workflow_prediction = workflow.predict_by_url(url="url", input_type="image") # Supports image, text, audio, video
+workflow_prediction = workflow.predict_by_url(url="url") # Supports image, text, audio, video
 
 # Customizing Workflow Inference Output
 workflow = Workflow(user_id="user_id", app_id="app_id", workflow_id="workflow_id",
                   output_config={"min_value": 0.98}) # Return predictions having prediction confidence > 0.98
-workflow_prediction = workflow.predict_by_filepath(filepath="local_filepath", input_type="text") # Supports image, text, audio, video
+workflow_prediction = workflow.predict_by_filepath(filepath="local_filepath") # Supports image, text, audio, video
 ```
 
 #### Workflows Listing

clarifai-10.9.5/clarifai/__init__.py

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

clarifai-10.9.5/clarifai/cli/base.py

@@ -0,0 +1,74 @@
+import os
+
+import click
+
+from ..utils.cli import dump_yaml, from_yaml, load_command_modules, set_base_url
+
+
+@click.group()
+@click.pass_context
+def cli(ctx):
+  """Clarifai CLI"""
+  ctx.ensure_object(dict)
+  config_path = 'config.yaml'
+  if os.path.exists(config_path):
+    ctx.obj = from_yaml(config_path)
+  else:
+    ctx.obj = {}
+
+
+@cli.command()
+@click.option('--config', type=click.Path(), required=False, help='Path to the config file')
+@click.option(
+    '-e',
+    '--env',
+    required=False,
+    help='Environment to use, choose from prod, staging and dev',
+    type=click.Choice(['prod', 'staging', 'dev']))
+@click.option('--user_id', required=False, help='User ID')
+@click.pass_context
+def login(ctx, config, env, user_id):
+  """Login command to set PAT and other configurations."""
+
+  if config and os.path.exists(config):
+    ctx.obj = from_yaml(config)
+
+  if 'pat' in ctx.obj:
+    os.environ["CLARIFAI_PAT"] = ctx.obj['pat']
+    click.echo("Loaded PAT from config file.")
+  elif 'CLARIFAI_PAT' in os.environ:
+    ctx.obj['pat'] = os.environ["CLARIFAI_PAT"]
+    click.echo("Loaded PAT from environment variable.")
+  else:
+    _pat = click.prompt(
+        "Get your PAT from https://clarifai.com/settings/security and pass it here", type=str)
+    os.environ["CLARIFAI_PAT"] = _pat
+    ctx.obj['pat'] = _pat
+    click.echo("PAT saved successfully.")
+
+  if user_id:
+    ctx.obj['user_id'] = user_id
+    os.environ["CLARIFAI_USER_ID"] = ctx.obj['user_id']
+  elif 'user_id' in ctx.obj or 'CLARIFAI_USER_ID' in os.environ:
+    ctx.obj['user_id'] = ctx.obj.get('user_id', os.environ["CLARIFAI_USER_ID"])
+    os.environ["CLARIFAI_USER_ID"] = ctx.obj['user_id']
+
+  if env:
+    ctx.obj['env'] = env
+    ctx.obj['base_url'] = set_base_url(env)
+    os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
+  elif 'env' in ctx.obj:
+    ctx.obj['env'] = ctx.obj.get('env', "prod")
+    ctx.obj['base_url'] = set_base_url(ctx.obj['env'])
+    os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
+  elif 'CLARIFAI_API_BASE' in os.environ:
+    ctx.obj['base_url'] = os.environ["CLARIFAI_API_BASE"]
+
+  dump_yaml(ctx.obj, 'config.yaml')
+
+
+# Import the CLI commands to register them
+load_command_modules()
+
+if __name__ == '__main__':
+  cli()

clarifai-10.9.5/clarifai/cli/model.py

@@ -0,0 +1,65 @@
+import click
+from clarifai.cli.base import cli
+
+
+@cli.group()
+def model():
+  """Manage models: upload, test locally"""
+  pass
+
+
+@model.command()
+@click.option(
+    '--model_path',
+    type=click.Path(exists=True),
+    required=True,
+    help='Path to the model directory.')
+@click.option(
+    '--download_checkpoints',
+    is_flag=True,
+    help=
+    'Flag to download checkpoints before uploading and including them in the tar file that is uploaded. Defaults to False, which will attempt to download them at docker build time.',
+)
+@click.option(
+    '--skip_dockerfile',
+    is_flag=True,
+    help=
+    'Flag to skip generating a dockerfile so that you can manually edit an already created dockerfile.',
+)
+def upload(model_path, download_checkpoints, skip_dockerfile):
+  """Upload a model to Clarifai."""
+  from clarifai.runners.models import model_upload
+
+  model_upload.main(model_path, download_checkpoints, skip_dockerfile)
+
+
+@model.command()
+@click.option(
+    '--model_path',
+    type=click.Path(exists=True),
+    required=True,
+    help='Path to the model directory.')
+def test_locally(model_path):
+  """Test model locally."""
+  try:
+    from clarifai.runners.models import model_run_locally
+    model_run_locally.main(model_path)
+    click.echo(f"Model tested locally from {model_path}.")
+  except Exception as e:
+    click.echo(f"Failed to test model locally: {e}", err=True)
+
+
+@model.command()
+@click.option(
+    '--model_path',
+    type=click.Path(exists=True),
+    required=True,
+    help='Path to the model directory.')
+def run_locally(model_path):
+  """Run model locally and starts a GRPC server to serve the model."""
+  try:
+    from clarifai.runners.models import model_run_locally
+    model_run_locally.main(model_path, run_model_server=True)
+    click.echo(f"Model server started locally from {model_path}.")
+  except Exception as e:
+    click.echo(f"Failed to starts model server locally: {e}", err=True)

{clarifai-10.9.2 → clarifai-10.9.5}/clarifai/client/auth/helper.py

@@ -5,11 +5,16 @@ from urllib.parse import urlparse
 
 from clarifai_grpc.channel.clarifai_channel import ClarifaiChannel
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2_grpc
+
+from clarifai import __version__
 from clarifai.utils.constants import CLARIFAI_PAT_ENV_VAR, CLARIFAI_SESSION_TOKEN_ENV_VAR
 
 DEFAULT_BASE = "https://api.clarifai.com"
 DEFAULT_UI = "https://clarifai.com"
 
+REQUEST_ID_PREFIX_HEADER = "x-clarifai-request-id-prefix"
+REQUEST_ID_PREFIX = f"sdk-python-{__version__}"
+
 # Map from base domain to True / False for whether the base has https or http.
 # This is filled in get_stub() if it's not in there already.
 base_https_cache = {}
@@ -136,7 +141,7 @@ class ClarifaiAuthHelper:
 
     # Then add in the query params.
     try:
-      auth.add_streamlit_query_params(st.experimental_get_query_params())
+      auth.add_streamlit_query_params(dict(st.query_params))
     except Exception as e:
       st.error(e)
       st.stop()
@@ -269,9 +274,11 @@ Additionally, these optional params are supported:
       metadata: the metadata need to send with all grpc API calls in the API client.
     """
     if self._pat != "":
-      return (("authorization", "Key %s" % self._pat),)
+      return (("authorization", "Key %s" % self._pat), (REQUEST_ID_PREFIX_HEADER,
+                                                        REQUEST_ID_PREFIX))
     elif self._token != "":
-      return (("x-clarifai-session-token", self._token),)
+      return (("x-clarifai-session-token", self._token), (REQUEST_ID_PREFIX_HEADER,
+                                                          REQUEST_ID_PREFIX))
     else:
       raise Exception("'token' or 'pat' needed to be provided in the query params or env vars.")
 

{clarifai-10.9.2 → clarifai-10.9.5}/clarifai/client/input.py

@@ -100,7 +100,7 @@ class Inputs(Lister, BaseClient):
       if not label_ids:
         concepts=[
             resources_pb2.Concept(
-            id=f"id-{''.join(_label.split(' '))}", name=_label, value=1.)\
+            id=_label, name=_label, value=1.)\
             for _label in labels
         ]
       else:
@@ -516,7 +516,7 @@ class Inputs(Lister, BaseClient):
                 right_col=bbox[2]  #x_max
             )),
             data=resources_pb2.Data(concepts=[
-                resources_pb2.Concept(id=f"id-{''.join(label.split(' '))}", name=label, value=1.)
+                resources_pb2.Concept(id=label, name=label, value=1.)
                 if not label_id else resources_pb2.Concept(id=label_id, name=label, value=1.)
             ]))
     ])
@@ -561,7 +561,7 @@ class Inputs(Lister, BaseClient):
                         visibility="VISIBLE") for _point in polygons
                 ])),
             data=resources_pb2.Data(concepts=[
-                resources_pb2.Concept(id=f"id-{''.join(label.split(' '))}", name=label, value=1.)
+                resources_pb2.Concept(id=label, name=label, value=1.)
                 if not label_id else resources_pb2.Concept(id=label_id, name=label, value=1.)
             ]))
     ])