qwak-sdk 0.5.85__py3-none-any.whl → 0.5.87__py3-none-any.whl

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/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.dist-info → qwak_sdk-0.5.87.dist-info}/METADATA

@@ -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.dist-info → qwak_sdk-0.5.87.dist-info}/RECORD

@@ -1,5 +1,5 @@
-qwak_sdk/__init__.py,sha256=IHd_9l0NwzDVnUsFJwNyy2fGzu1dROSeP_vQcpSDl1k,135
-qwak_sdk/cli.py,sha256=AFUAqablunsHasfY1ikhj9GYUARbQ5dR-sblxqa1id4,2841
+qwak_sdk/__init__.py,sha256=jo5nEmqxiLv-oPqC7yz-6Y8fDeIleT69xAaNo6gE9Nw,135
+qwak_sdk/cli.py,sha256=frMefF0AmLI1g5A9aADNueUkMDjRHikKlmXIA2i4kYA,4510
 qwak_sdk/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/_logic/tools.py,sha256=uJOSfpifONXjFJjaHvm_7ivTs8K0PO56YoxhU0dktPU,239
@@ -319,7 +319,7 @@ qwak_sdk/tools/colors.py,sha256=7pui_GGjC4uZKYFsIyXaJjYsjLxJVHb4OrfTgr93hqo,287
 qwak_sdk/tools/files.py,sha256=AyKJTOy7NhvP3SrqwIw_lxYNCOy1CvLgMmSJpWZ0OKM,2257
 qwak_sdk/tools/log_handling.py,sha256=Aa1EmxUPCX8YWiZRutUvnqPv6K_z1zoGMwIWsEv24mM,6327
 qwak_sdk/tools/utils.py,sha256=SHmU4r_m2ABZyFYMC03P17GvltPbYbmB39hvalIZEtI,1168
-qwak_sdk-0.5.85.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
-qwak_sdk-0.5.85.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-qwak_sdk-0.5.85.dist-info/METADATA,sha256=BvusqMnPJ6jGzvONLg52XICX3ilx1qYObj787b3Lptc,2978
-qwak_sdk-0.5.85.dist-info/RECORD,,
+qwak_sdk-0.5.87.dist-info/METADATA,sha256=x3I9wEw0oYlrmhNnKVJOHhL0ovEOSU3fT7NfY9H6YBg,2774
+qwak_sdk-0.5.87.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+qwak_sdk-0.5.87.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
+qwak_sdk-0.5.87.dist-info/RECORD,,

{qwak_sdk-0.5.85.dist-info → qwak_sdk-0.5.87.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any