clarifai 11.1.7rc3__py3-none-any.whl → 11.2.0__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.7rc3"
+__version__ = "11.2.0"

clarifai/cli/base.py

@@ -2,7 +2,8 @@ import os
 
 import click
 
-from ..utils.cli import dump_yaml, from_yaml, load_command_modules, set_base_url
+from clarifai.utils.cli import dump_yaml, from_yaml, load_command_modules, set_base_url
+from clarifai.utils.logging import logger
 
 
 class CustomMultiGroup(click.Group):
@@ -41,11 +42,18 @@ class CustomMultiGroup(click.Group):
 def cli(ctx):
   """Clarifai CLI"""
   ctx.ensure_object(dict)
-  config_path = 'config.yaml'
+  config_path = f"{os.getenv('HOME')}/.clarifai/config.yaml"
+  config_dir = os.path.dirname(config_path)
   if os.path.exists(config_path):
     ctx.obj = from_yaml(config_path)
   else:
     ctx.obj = {}
+    if ctx.invoked_subcommand != 'login':
+      logger.error("Error getting config: CLI config file missing")
+      logger.info("Running `login` to set up the CLI configuration.")
+      if not os.path.exists(config_dir):
+        os.makedirs(config_dir)
+      ctx.invoke(login)
 
 
 @cli.command()
@@ -101,8 +109,13 @@ def login(ctx, config, env, user_id):
     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"]
+  else:
+    ctx.obj['env'] = 'prod'
+    ctx.obj['base_url'] = set_base_url(ctx.obj['env'])
+    os.environ["CLARIFAI_API_BASE"] = ctx.obj['base_url']
+    click.echo("Base URL saved successfully.")
 
-  dump_yaml(ctx.obj, 'config.yaml')
+  dump_yaml(ctx.obj, f"{os.getenv('HOME')}/.clarifai/config.yaml")
 
 
 # Import the CLI commands to register them

clarifai/cli/model.py

@@ -76,31 +76,6 @@ def download_checkpoints(model_path, out_path, stage):
     required=False,
     default=".",
 )
-@click.option(
-    '--out_path',
-    type=click.Path(exists=False),
-    required=False,
-    default=None,
-    help='Path to write the method signature defitions to. If not provided, use stdout.')
-def signatures(model_path, out_path):
-  """Generate method signatures for the model."""
-
-  from clarifai.runners.models.model_builder import ModelBuilder
-  builder = ModelBuilder(model_path, download_validation_only=True)
-  signatures = builder.method_signatures_yaml()
-  if out_path:
-    with open(out_path, 'w') as f:
-      f.write(signatures)
-  else:
-    click.echo(signatures)
-
-
-@model.command()
-@click.option(
-    '--model_path',
-    type=click.Path(exists=True),
-    required=True,
-    help='Path to the model directory.')
 @click.option(
     '--mode',
     type=click.Choice(['env', 'container'], case_sensitive=False),