jvcli 2.0.20__py3-none-any.whl → 2.0.22__py3-none-any.whl

jvcli/__init__.py

@@ -4,5 +4,5 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.20"
+__version__ = "2.0.22"
 __supported__jivas__versions__ = ["2.0.0"]

jvcli/commands/create.py

@@ -231,7 +231,7 @@ node {architype} :{node_class}: {{
         app_code = """
 \"\"\" This module renders the streamlit app for the {title}. \"\"\"
 
-from jvclient.client.lib.widgets import app_controls, app_header, app_update_action
+from jvcli.client.lib.widgets import app_controls, app_header, app_update_action
 
 from streamlit_router import StreamlitRouter
 

jvcli/commands/server.py

@@ -152,7 +152,7 @@ def initagents() -> None:
     Initialize agents in the Jivas system.
 
     Usage:
-        jvcli initagents
+        jvcli server initagents
     """
 
     # Check if server is running
@@ -203,7 +203,7 @@ def importagent(agent_name: str, version: str) -> None:
     Import an agent from a DAF package.
 
     Usage:
-        jvcli importagent <agent_name> [--version <jivas_version>]
+        jvcli server importagent <agent_name> [--version <jivas_version>]
     """
 
     # Check if server is running

jvcli/utils.py

@@ -5,10 +5,10 @@ import re
 import tarfile
 
 import click
+import nodesemver
 import requests
+import semver
 import yaml
-from packaging.specifiers import InvalidSpecifier, SpecifierSet
-from packaging.version import InvalidVersion, Version
 
 from jvcli import __supported__jivas__versions__
 from jvcli.api import RegistryAPI
@@ -91,58 +91,36 @@ def validate_package_name(name: str) -> None:
         )
 
 
-def is_version_compatible(version: str, specifiers: str) -> bool:
+def is_version_compatible(
+    version: str, specifiers: str, allow_prerelease: bool = True
+) -> bool:
     """
-    Determines if the provided version satisfies the given specifiers or exact version match.
+    Determines if the provided version satisfies the given specifiers or exact version match,
+    with an option to consider prerelease versions.
 
-    Args:
-    - version (str): The version to be checked. E.g., "2.1.0".
-    - specifiers (str): The version specifier set or exact version. E.g., "2.1.0", ">=0.2,<0.3", or "^2.0.0".
-
-    Returns:
-    - bool: True if the version satisfies the specifier set or exact match, False otherwise.
+    - Converts comma-separated specifiers to space-separated (Node-style).
     """
-    try:
-        # Handle edge cases for empty strings or None inputs
-        if not version or not specifiers:
-            return False
-
-        # Handle exact version equality when no special characters present
-        if all(c not in specifiers for c in "<>!=~^*,"):
-            return Version(version) == Version(specifiers)
-
-        # Handle tilde (~) syntax, as in npm semver, if used
-        if specifiers.startswith("~"):
-            base_version = Version(specifiers[1:])
-            if base_version.release is None or len(base_version.release) < 2:
-                raise InvalidSpecifier(f"Invalid tilde specifier: '{specifiers}'")
-            next_minor = base_version.minor + 1
-            specifiers = f">={base_version},<{base_version.major}.{next_minor}.0"
-
-        # Explicitly handle caret (^) syntax (npm semver style)
-        elif specifiers.startswith("^"):
-            base_version = Version(specifiers[1:])
-            major, minor, patch = (
-                base_version.major,
-                base_version.minor,
-                base_version.micro,
-            )
-
-            if major > 0:
-                specifiers = f">={base_version},<{major + 1}.0.0"
-            elif major == 0 and minor > 0:
-                specifiers = f">={base_version},<0.{minor + 1}.0"
-            else:  # major == 0 and minor == 0
-                specifiers = f">={base_version},<0.0.{patch + 1}"
-
-        # Finally check using the SpecifierSet
-        specifier_set = SpecifierSet(specifiers)
-        parsed_version = Version(version)
+    if not version or not specifiers:
+        return False
 
-        return parsed_version in specifier_set
+    # Replace comma(s) and optional surrounding spaces with one space
+    specifiers = re.sub(r"\s*,\s*", " ", specifiers.strip())
 
-    except (InvalidVersion, InvalidSpecifier, TypeError) as e:
-        print(f"Version parsing error: {e}")
+    try:
+        # For nodesemver
+        return nodesemver.satisfies(
+            version, specifiers, include_prerelease=allow_prerelease
+        )
+    except ImportError:
+        try:
+            # For python-semver >=3.0.0
+            # semver>=3.0.0 supports allow_prerelease
+            return semver.satisfies(
+                version, specifiers, allow_prerelease=allow_prerelease
+            )
+        except Exception:
+            return False
+    except Exception:
         return False
 
 

{jvcli-2.0.20.dist-info → jvcli-2.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.20
+Version: 2.0.22
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.
@@ -18,6 +18,8 @@ Requires-Dist: streamlit-elements>=0.1.0
 Requires-Dist: streamlit-router>=0.1.8
 Requires-Dist: streamlit-javascript>=0.1.5
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: semver>=3.0.4
+Requires-Dist: node-semver>=0.9.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{jvcli-2.0.20.dist-info → jvcli-2.0.22.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jvcli/__init__.py,sha256=7DZPxtJmca6a1wPs0ff-L6lGopkyfrLpndciskhCi8Q,171
+jvcli/__init__.py,sha256=lT7FAm-c7E3TY64J6wemhe_xxJ2oqIp46gFZyyPqf_w,171
 jvcli/api.py,sha256=gd-EP1e75e7HijyrP-EF6i_jjCo6YUeSbm1l5daKLfQ,10352
 jvcli/auth.py,sha256=mHP425hvXhNxzeX--cApkrP7SdDPmfG6V0Li5TLHmIg,1953
 jvcli/cli.py,sha256=ntTkriNGtfxFAdJw5ikdq2wD43pIqDpb7lfXsCMXOWQ,1191
-jvcli/utils.py,sha256=rhXStZMsW7mMp5l0p_90c7G0p1FhfVB97Cr9zN1plds,8484
+jvcli/utils.py,sha256=ZTwvGcEE94aORLDbevfkPNICFqNU8PpqH7d424xuYlg,7242
 jvcli/client/__init__.py,sha256=WGP05OBzZHReqENYs1qYqMnYvgAaNVW6KvGQvyB3NGs,85
 jvcli/client/app.py,sha256=bjdGY9J43qymdmODt0BgzN66Aolyo1653ZuCj_gNdKA,6184
 jvcli/client/lib/__init__.py,sha256=_Wv8CNIxeIle_x0U9T6w9s5mPuOY9-0u69BvTEPXLUw,38
@@ -18,11 +18,11 @@ jvcli/commands/__init__.py,sha256=bjZvM55MC2NugvRlxkEU9CDDP9NnsygcsGZewj1gQcg,57
 jvcli/commands/auth.py,sha256=lO5G1_TCbxhOfy7xH9EULwvCLqf7iQTF9Q3MrpAtHPY,1611
 jvcli/commands/clean.py,sha256=AOyssr5MZ_EJ0wW6Q8GoWQ7ve5OGke9W82GusBFoDCg,1006
 jvcli/commands/client.py,sha256=yIp0wCmoxgxImJrpl0dH9qURGMcVKTxonVd1d-BdsxI,1432
-jvcli/commands/create.py,sha256=HIL01nTcyEEXk4yLMwnPsRtj_cbhsuz2AEN2BwWeI-o,13393
+jvcli/commands/create.py,sha256=koPSQcQX4yFtZsmODJmPCevkov3m36JpkDHhLmMgzwg,13390
 jvcli/commands/download.py,sha256=GiLX_43CQOW9d5vF04fAszOWh3AB-7Mgote4tJ9RVng,3416
 jvcli/commands/info.py,sha256=NyIDpR_AGMMSFPE0tFZv4dIuv_gwqrfd589zQAA_Q3s,2685
 jvcli/commands/publish.py,sha256=q1ihoL42GmEsU5ggHN3bcg8QD26kjRUZGfQpRzI2GMo,6630
-jvcli/commands/server.py,sha256=9Ak9w9xENsYV_U2XQGAny8zc6iLfJSMc-cazjeD5Hs0,8136
+jvcli/commands/server.py,sha256=UX0h8ssmDMZBfAP58vzC6gpqkiNefPPOGmsJANAcZ38,8150
 jvcli/commands/startproject.py,sha256=5qis2Dhed-HhKqZ8e37Xpy__Rmqga8cTwAOmfGVPzmU,3375
 jvcli/commands/studio.py,sha256=avD5M3Ss7R6AtUMN3Mk6AmTyPJ7LnXcmwQ0mbRzivrQ,8192
 jvcli/commands/update.py,sha256=LwCLg-W1b8WSdFkiiJ8WwTit2HJXTLpM5OQ4WBTe9C4,1997
@@ -53,9 +53,9 @@ jvcli/templates/2.0.0/project/main.jac,sha256=r37jsaGq-85YvDbHP3bQvBXk0u8w0rtRTZ
 jvcli/templates/2.0.0/project/actions/README.md,sha256=TU1t-rOBH5WQP_HUWaEBLq5BbPv4jejtjIrwTW4hZwM,1742
 jvcli/templates/2.0.0/project/daf/README.md,sha256=fO-dcc3j-1E6sFagIvvJsISAth11N-2d64G0yHi7JrY,1682
 jvcli/templates/2.0.0/project/tests/README.md,sha256=-1ZXkxuUKa6tMw_jlF3rpCvUFq8ijW2L-nSuAkbCANo,917
-jvcli-2.0.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvcli-2.0.20.dist-info/METADATA,sha256=gGszGZTT-H41S6IADbTnS_1VHAnXBaeDLSlsshwr-xI,21604
-jvcli-2.0.20.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-jvcli-2.0.20.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
-jvcli-2.0.20.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
-jvcli-2.0.20.dist-info/RECORD,,
+jvcli-2.0.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvcli-2.0.22.dist-info/METADATA,sha256=jP6ROizsxjWb8u8KcbtmdczZNZ8xXl6p2o-ZMu4c75o,21667
+jvcli-2.0.22.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+jvcli-2.0.22.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
+jvcli-2.0.22.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
+jvcli-2.0.22.dist-info/RECORD,,

{jvcli-2.0.20.dist-info → jvcli-2.0.22.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any