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

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

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.85
+Version: 0.5.86
 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
@@ -41,7 +40,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.165)
 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.86}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.85"
+version = "0.5.86"
 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.165"
 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.86}/qwak_sdk/__init__.py

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

{qwak_sdk-0.5.85 → qwak_sdk-0.5.86}/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 → qwak_sdk-0.5.86}/qwak_sdk/commands/models/build/ui.py

@@ -132,8 +132,8 @@ from qwak_sdk.inner.tools.config_handler import config_handler
 )
 @click.option(
     "--cache/--no-cache",
-    default=None,
-    help="Disable docker build cache. [Default: Cache enabled]",
+    default=False,
+    help="Disable docker build cache. [Default: Cache disabled]",
 )
 @click.option(
     "-v",

{qwak_sdk-0.5.85 → qwak_sdk-0.5.86}/setup.py

@@ -134,7 +134,7 @@ install_requires = \
  'croniter==1.4.1',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.4.111',
+ 'qwak-core==0.4.165',
  'qwak-inference>=0.1.18,<0.2.0',
  'rich>=13.0.0',
  'tabulate>=0.8.0',
@@ -204,7 +204,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.85',
+    'version': '0.5.86',
     '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',
@@ -217,7 +217,7 @@ setup_kwargs = {
     'install_requires': install_requires,
     'extras_require': extras_require,
     'entry_points': entry_points,
-    'python_requires': '>=3.7.1,<3.12',
+    'python_requires': '>=3.9,<3.12',
 }