qwak-sdk 0.5.85__tar.gz → 0.5.87__tar.gz

{qwak_sdk-0.5.85 → qwak_sdk-0.5.87}/PKG-INFO

@@ -1,24 +1,20 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: qwak-sdk
-Version: 0.5.85
+Version: 0.5.87
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
 Author: Qwak
 Author-email: info@qwak.com
-Requires-Python: >=3.7.1,<3.12
+Requires-Python: >=3.9,<3.12
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Provides-Extra: batch
@@ -41,7 +37,7 @@ Requires-Dist: pyarrow (>=6.0.0,<11.0.0) ; extra == "batch" or extra == "feature
 Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
 Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
 Requires-Dist: python-json-logger (>=2.0.2)
-Requires-Dist: qwak-core (==0.4.111)
+Requires-Dist: qwak-core (==0.4.180)
 Requires-Dist: qwak-inference (>=0.1.18,<0.2.0)
 Requires-Dist: rich (>=13.0.0)
 Requires-Dist: tabulate (>=0.8.0)

{qwak_sdk-0.5.85 → qwak_sdk-0.5.87}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.85"
+version = "0.5.87"
 description = "Qwak SDK and CLI for qwak models"
 authors = ["Qwak <info@qwak.com>"]
 readme = "README.md"
@@ -28,8 +28,8 @@ license = "Apache-2.0"
 qwak = "qwak_sdk.main:qwak_cli"
 
 [tool.poetry.dependencies]
-python = ">=3.7.1,<3.12"
-qwak-core = "==0.4.111"
+python = ">=3.9,<3.12"
+qwak-core = "0.4.180"
 qwak-inference = "~0.1.18"
 croniter = "==1.4.1"
 tabulate = ">=0.8.0"
@@ -63,7 +63,7 @@ black = "23.1.0"
 flake8 = "5.0.0"
 bandit = { version = "^1.7.4", extras = ["toml"] }
 coverage = "7.2.1"
-typing_extensions = "4.4.0"
+typing_extensions = ">=4.4.0"
 bump2version = "1.0.1"
 typeguard = "^2"
 isort = "^5"

{qwak_sdk-0.5.85 → qwak_sdk-0.5.87}/qwak_sdk/__init__.py

@@ -1,6 +1,6 @@
 # fmt: off
 __author__ = '''Qwak.ai'''
-__version__ = '0.5.85'
+__version__ = '0.5.87'
 
 from qwak.inner import wire_dependencies
 

{qwak_sdk-0.5.85 → qwak_sdk-0.5.87}/qwak_sdk/cli.py

@@ -4,6 +4,7 @@ import click
 from packaging import version
 from qwak.inner.di_configuration import UserAccountConfiguration
 from qwak.inner.di_configuration.account import UserAccount
+from qwak.inner.tool.auth import FrogMLAuthClient
 
 from qwak_sdk import __version__ as sdk_version
 from qwak_sdk.commands.admin.admin_commands_group import admin_commands_group
@@ -41,7 +42,32 @@ def create_qwak_cli():
 
     @qwak_cli.command("configure", short_help="Configure the Qwak environment")
     @click.option(
-        "--api-key", metavar="PASSWORD", required=False, help="Qwak assigned API key"
+        "--api-key",
+        metavar="QWAK_API_KEY",
+        required=False,
+        help="Qwak assigned API key",
+    )
+    @click.option(
+        "--url", metavar="BASE_URL", required=False, help="Artifactory base url"
+    )
+    @click.option(
+        "--username", metavar="USERNAME", required=False, help="The user's username"
+    )
+    @click.option(
+        "--password", metavar="PASSWORD", required=False, help="The user's password"
+    )
+    @click.option(
+        "--token",
+        metavar="TOKEN",
+        required=False,
+        help="Access token to authenticate",
+    )
+    @click.option(
+        "--interactive",
+        metavar="INTERACTIVE",
+        required=False,
+        help="Login with interactive flow",
+        default=False,
     )
     @click.option(
         "--environment",
@@ -51,15 +77,46 @@ def create_qwak_cli():
         is_eager=True,
         help="Qwak environment's name",
     )
+    @click.option(
+        "--type",
+        metavar="TYPE",
+        default="qwak",
+        required=False,
+        type=click.Choice(["qwak", "jfrog"], case_sensitive=False),
+        is_eager=True,
+        help="Login type (qwak/jfrog)",
+    )
     @profile_setter_wrapper
-    def set_configuration(api_key: Optional[str], environment: str, **_):
-        if api_key is None:
-            api_key = click.prompt("Please enter your API key", type=str)
-
-        account_config = UserAccountConfiguration()
-        account_config.configure_user(UserAccount(api_key=api_key))
+    def set_configuration(
+        api_key: Optional[str],
+        url: Optional[str],
+        username: Optional[str],
+        password: Optional[str],
+        token: Optional[str],
+        interactive: bool,
+        environment: str,
+        type: str,
+        **_,
+    ):
+        if type.lower() == "jfrog":
+            account_config = UserAccountConfiguration(auth_client=FrogMLAuthClient)
+            account_config.configure_user(
+                UserAccount(
+                    url=url,
+                    username=username,
+                    password=password,
+                    api_key=token,
+                    anonymous=False,
+                    is_interactive=interactive,
+                )
+            )
+        elif type.lower() == "qwak":
+            if api_key is None:
+                api_key = click.prompt("Please enter your API key", type=str)
 
-        print(f"User successfully configured for the '{environment}' environment")
+            account_config = UserAccountConfiguration()
+            account_config.configure_user(UserAccount(api_key=api_key))
+            print(f"User successfully configured for the '{environment}' environment")
 
     qwak_cli.add_command(projects_command_group)
     qwak_cli.add_command(models_command_group)

qwak_sdk-0.5.85/setup.py

@@ -1,224 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['qwak_sdk',
- 'qwak_sdk.commands',
- 'qwak_sdk.commands._logic',
- 'qwak_sdk.commands.admin',
- 'qwak_sdk.commands.admin.apikeys',
- 'qwak_sdk.commands.admin.apikeys.generate',
- 'qwak_sdk.commands.admin.apikeys.revoke',
- 'qwak_sdk.commands.alerts',
- 'qwak_sdk.commands.alerts.delete',
- 'qwak_sdk.commands.alerts.list',
- 'qwak_sdk.commands.alerts.register',
- 'qwak_sdk.commands.audience',
- 'qwak_sdk.commands.audience._logic',
- 'qwak_sdk.commands.audience._logic.config',
- 'qwak_sdk.commands.audience._logic.config.v1',
- 'qwak_sdk.commands.audience.create',
- 'qwak_sdk.commands.audience.delete',
- 'qwak_sdk.commands.audience.get',
- 'qwak_sdk.commands.audience.list',
- 'qwak_sdk.commands.audience.update',
- 'qwak_sdk.commands.auto_scalling',
- 'qwak_sdk.commands.auto_scalling._logic',
- 'qwak_sdk.commands.auto_scalling._logic.config',
- 'qwak_sdk.commands.auto_scalling.attach',
- 'qwak_sdk.commands.automations',
- 'qwak_sdk.commands.automations.delete',
- 'qwak_sdk.commands.automations.executions',
- 'qwak_sdk.commands.automations.executions.list',
- 'qwak_sdk.commands.automations.list',
- 'qwak_sdk.commands.automations.register',
- 'qwak_sdk.commands.feature_store',
- 'qwak_sdk.commands.feature_store.backfill',
- 'qwak_sdk.commands.feature_store.delete',
- 'qwak_sdk.commands.feature_store.execution',
- 'qwak_sdk.commands.feature_store.list',
- 'qwak_sdk.commands.feature_store.pause',
- 'qwak_sdk.commands.feature_store.register',
- 'qwak_sdk.commands.feature_store.resume',
- 'qwak_sdk.commands.feature_store.trigger',
- 'qwak_sdk.commands.models',
- 'qwak_sdk.commands.models.build',
- 'qwak_sdk.commands.models.build._logic',
- 'qwak_sdk.commands.models.build._logic.client_logs',
- 'qwak_sdk.commands.models.build._logic.phase',
- 'qwak_sdk.commands.models.build._logic.phase.a_fetch_model_code',
- 'qwak_sdk.commands.models.build._logic.phase.b_remote_register_qwak_build',
- 'qwak_sdk.commands.models.build._logic.phase.c_deploy',
- 'qwak_sdk.commands.models.build._logic.util',
- 'qwak_sdk.commands.models.builds',
- 'qwak_sdk.commands.models.builds.cancel',
- 'qwak_sdk.commands.models.builds.logs',
- 'qwak_sdk.commands.models.builds.status',
- 'qwak_sdk.commands.models.create',
- 'qwak_sdk.commands.models.delete',
- 'qwak_sdk.commands.models.deployments',
- 'qwak_sdk.commands.models.deployments.deploy',
- 'qwak_sdk.commands.models.deployments.deploy._logic',
- 'qwak_sdk.commands.models.deployments.deploy.batch',
- 'qwak_sdk.commands.models.deployments.deploy.batch._logic',
- 'qwak_sdk.commands.models.deployments.deploy.realtime',
- 'qwak_sdk.commands.models.deployments.deploy.realtime._logic',
- 'qwak_sdk.commands.models.deployments.deploy.streaming',
- 'qwak_sdk.commands.models.deployments.deploy.streaming._logic',
- 'qwak_sdk.commands.models.deployments.undeploy',
- 'qwak_sdk.commands.models.deployments.undeploy._logic',
- 'qwak_sdk.commands.models.describe',
- 'qwak_sdk.commands.models.executions',
- 'qwak_sdk.commands.models.executions.cancel',
- 'qwak_sdk.commands.models.executions.report',
- 'qwak_sdk.commands.models.executions.start',
- 'qwak_sdk.commands.models.executions.status',
- 'qwak_sdk.commands.models.init',
- 'qwak_sdk.commands.models.init._logic',
- 'qwak_sdk.commands.models.init._logic.template',
- 'qwak_sdk.commands.models.init._logic.template.churn',
- 'qwak_sdk.commands.models.init._logic.template.churn.{{cookiecutter.model_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.churn.{{cookiecutter.model_directory}}.main',
- 'qwak_sdk.commands.models.init._logic.template.churn.{{cookiecutter.model_directory}}.tests',
- 'qwak_sdk.commands.models.init._logic.template.churn.{{cookiecutter.model_directory}}.tests.it',
- 'qwak_sdk.commands.models.init._logic.template.credit_risk',
- 'qwak_sdk.commands.models.init._logic.template.credit_risk.{{cookiecutter.model_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.credit_risk.{{cookiecutter.model_directory}}.main',
- 'qwak_sdk.commands.models.init._logic.template.general',
- 'qwak_sdk.commands.models.init._logic.template.general.{{cookiecutter.model_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.general.{{cookiecutter.model_directory}}.{{cookiecutter.main_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.general.{{cookiecutter.model_directory}}.{{cookiecutter.test_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.titanic',
- 'qwak_sdk.commands.models.init._logic.template.titanic.{{cookiecutter.model_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.titanic.{{cookiecutter.model_directory}}.main',
- 'qwak_sdk.commands.models.init._logic.template.titanic.{{cookiecutter.model_directory}}.tests',
- 'qwak_sdk.commands.models.init._logic.template.titanic.{{cookiecutter.model_directory}}.tests.it',
- 'qwak_sdk.commands.models.init._logic.template.titanic_poetry',
- 'qwak_sdk.commands.models.init._logic.template.titanic_poetry.{{cookiecutter.model_directory}}',
- 'qwak_sdk.commands.models.init._logic.template.titanic_poetry.{{cookiecutter.model_directory}}.main',
- 'qwak_sdk.commands.models.init._logic.template.titanic_poetry.{{cookiecutter.model_directory}}.tests',
- 'qwak_sdk.commands.models.init._logic.template.titanic_poetry.{{cookiecutter.model_directory}}.tests.it',
- 'qwak_sdk.commands.models.list',
- 'qwak_sdk.commands.models.list_models',
- 'qwak_sdk.commands.models.metadata',
- 'qwak_sdk.commands.models.runtime',
- 'qwak_sdk.commands.models.runtime.logs',
- 'qwak_sdk.commands.models.runtime.update',
- 'qwak_sdk.commands.projects',
- 'qwak_sdk.commands.projects.create',
- 'qwak_sdk.commands.projects.delete',
- 'qwak_sdk.commands.projects.list',
- 'qwak_sdk.commands.secrets',
- 'qwak_sdk.commands.secrets.delete',
- 'qwak_sdk.commands.secrets.get',
- 'qwak_sdk.commands.secrets.set',
- 'qwak_sdk.commands.workspaces',
- 'qwak_sdk.commands.workspaces._logic',
- 'qwak_sdk.commands.workspaces.config',
- 'qwak_sdk.commands.workspaces.create',
- 'qwak_sdk.commands.workspaces.delete',
- 'qwak_sdk.commands.workspaces.start',
- 'qwak_sdk.commands.workspaces.stop',
- 'qwak_sdk.commands.workspaces.update',
- 'qwak_sdk.exceptions',
- 'qwak_sdk.inner',
- 'qwak_sdk.inner.tools',
- 'qwak_sdk.inner.tools.logger',
- 'qwak_sdk.tools']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['cookiecutter',
- 'croniter==1.4.1',
- 'gitpython>=2.1.0',
- 'python-json-logger>=2.0.2',
- 'qwak-core==0.4.111',
- 'qwak-inference>=0.1.18,<0.2.0',
- 'rich>=13.0.0',
- 'tabulate>=0.8.0',
- 'yaspin>=2.0.0']
-
-extras_require = \
-{'batch': ['boto3>=1.24.116,<2.0.0',
-           'joblib>=1.1.0,<2.0.0',
-           'pyarrow>=6.0.0,<11.0.0'],
- 'batch:python_full_version >= "3.7.1" and python_version < "3.8"': ['pandas<1.4',
-                                                                     'pandas<1.4',
-                                                                     'pandas<1.4',
-                                                                     'pandas<1.4'],
- 'batch:python_version >= "3.10" and python_version < "3.12"': ['pandas>=1.4.0',
-                                                                'pandas>=1.4.0',
-                                                                'pandas>=1.4.0',
-                                                                'pandas>=1.4.0'],
- 'batch:python_version >= "3.8" and python_version < "3.9"': ['pandas>1.0',
-                                                              'pandas>1.0',
-                                                              'pandas>1.0',
-                                                              'pandas>1.0'],
- 'batch:python_version >= "3.9" and python_version < "3.10"': ['pandas>1.1.3',
-                                                               'pandas>1.1.3',
-                                                               'pandas>1.1.3',
-                                                               'pandas>1.1.3'],
- 'feature-store': ['pyarrow>=6.0.0,<11.0.0',
-                   'pyathena>=2.2.0,!=2.18.0',
-                   'cloudpickle==2.2.1',
-                   'pyspark==3.4.2'],
- 'feature-store:python_full_version >= "3.7.1" and python_version < "3.8"': ['pandas<1.4',
-                                                                             'pandas<1.4',
-                                                                             'pandas<1.4',
-                                                                             'pandas<1.4'],
- 'feature-store:python_version >= "3.10" and python_version < "3.12"': ['pandas>=1.4.0',
-                                                                        'pandas>=1.4.0',
-                                                                        'pandas>=1.4.0',
-                                                                        'pandas>=1.4.0'],
- 'feature-store:python_version >= "3.8" and python_version < "3.9"': ['pandas>1.0',
-                                                                      'pandas>1.0',
-                                                                      'pandas>1.0',
-                                                                      'pandas>1.0'],
- 'feature-store:python_version >= "3.9" and python_version < "3.10"': ['pandas>1.1.3',
-                                                                       'pandas>1.1.3',
-                                                                       'pandas>1.1.3',
-                                                                       'pandas>1.1.3'],
- 'feedback': ['boto3>=1.24.116,<2.0.0', 'joblib>=1.1.0,<2.0.0'],
- 'feedback:python_full_version >= "3.7.1" and python_version < "3.8"': ['pandas<1.4',
-                                                                        'pandas<1.4',
-                                                                        'pandas<1.4',
-                                                                        'pandas<1.4'],
- 'feedback:python_version >= "3.10" and python_version < "3.12"': ['pandas>=1.4.0',
-                                                                   'pandas>=1.4.0',
-                                                                   'pandas>=1.4.0',
-                                                                   'pandas>=1.4.0'],
- 'feedback:python_version >= "3.8" and python_version < "3.9"': ['pandas>1.0',
-                                                                 'pandas>1.0',
-                                                                 'pandas>1.0',
-                                                                 'pandas>1.0'],
- 'feedback:python_version >= "3.9" and python_version < "3.10"': ['pandas>1.1.3',
-                                                                  'pandas>1.1.3',
-                                                                  'pandas>1.1.3',
-                                                                  'pandas>1.1.3'],
- 'local-deployment': ['boto3>=1.24.116,<2.0.0']}
-
-entry_points = \
-{'console_scripts': ['qwak = qwak_sdk.main:qwak_cli']}
-
-setup_kwargs = {
-    'name': 'qwak-sdk',
-    'version': '0.5.85',
-    'description': 'Qwak SDK and CLI for qwak models',
-    'long_description': '# Qwak SDK\n\nQwak is an end-to-end production ML platform designed to allow data scientists to build, deploy, and monitor their models in production with minimal engineering friction.\n',
-    'author': 'Qwak',
-    'author_email': 'info@qwak.com',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'None',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'entry_points': entry_points,
-    'python_requires': '>=3.7.1,<3.12',
-}
-
-
-setup(**setup_kwargs)