jvcli 2.0.13__py3-none-any.whl → 2.0.15__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.13"
+__version__ = "2.0.15"
 __supported__jivas__versions__ = ["2.0.0"]

jvcli/templates/2.0.0/project/env.example

@@ -1,13 +1,37 @@
+# JIVAS/Jaclang configuration
+JIVAS_ENVIRONMENT=development
+
 JIVAS_USER=admin@jivas.com
 JIVAS_PASSWORD=password
 JIVAS_PORT=8000
-JIVAS_BASE_URL=http://localhost:8000
-JIVAS_STUDIO_URL=http://localhost:8989
-JIVAS_FILES_URL=http://localhost:9000/files
 JIVAS_DESCRIPTOR_ROOT_PATH=".jvdata"
 JIVAS_ACTIONS_ROOT_PATH="actions"
 JIVAS_DAF_ROOT_PATH="daf"
+JIVAS_BASE_URL=http://127.0.0.1:8000
+JIVAS_STUDIO_URL=http://127.0.0.1:8989
+JACPATH="./"
+
+# JIVAS Files Serving Config
+JIVAS_FILE_INTERFACE="local"
 JIVAS_FILES_ROOT_PATH=".files"
+JIVAS_FILES_URL=http://127.0.0.1:9000/files
+# S3 Config
+# JIVAS_S3_ENDPOINT=access_key_id # optional
+# JIVAS_S3_ACCESS_KEY_ID=access_key_id
+# JIVAS_S3_SECRET_ACCESS_KEY=secret_access_key
+# JIVAS_S3_REGION=us-east-1
+# JIVAS_S3_BUCKET_NAME=my-bucket
+
+# Secrets Config
 JIVAS_WEBHOOK_SECRET_KEY="ABCDEFGHIJK"
-JIVAS_ENVIRONMENT=development
-JACPATH="./"
+TOKEN_SECRET=s3cr3t
+
+# MongoDB Config
+# DATABASE_HOST=mongodb://localhost:27017/?replicaSet=my-rs
+
+# Typesense Config
+# TYPESENSE_HOST=localhost
+# TYPESENSE_PORT=8108
+# TYPESENSE_PROTOCOL=http
+# TYPESENSE_API_KEY=abcd
+# TYPESENSE_CONNECTION_TIMEOUT_SECONDS=2

jvcli/utils.py

@@ -6,8 +6,8 @@ import tarfile
 
 import click
 import yaml
-from packaging.specifiers import SpecifierSet
-from packaging.version import parse as parse_version
+from packaging.specifiers import InvalidSpecifier, SpecifierSet
+from packaging.version import InvalidVersion, Version
 
 from jvcli import __supported__jivas__versions__
 from jvcli.api import RegistryAPI
@@ -92,61 +92,56 @@ def validate_package_name(name: str) -> None:
 
 def is_version_compatible(version: str, specifiers: str) -> bool:
     """
-    Compares the provided version to a given set of specifications/modifiers or exact version match.
+    Determines if the provided version satisfies the given specifiers or exact version match.
 
     Args:
-    - version (str): The version to be compared. E.g., "2.1.0".
-    - specifiers (str): The version specifier set or exact version. E.g., "2.1.0" or ">=0.2,<0.3" or "0.0.1" or "^2.0.0"
+    - 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.
     """
     try:
-        # Parse the version to check
-        version = parse_version(version)
-
-        # Check if specifiers is a simple exact version match
-        try:
-            exact_version = parse_version(specifiers)
-            return version == exact_version
-        except Exception:
-            # If parsing fails, treat it as a specifier set
-            pass
-
-        # Handle "~" shorthand by translating it to a compatible range
+        # 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 = specifiers[1:]
-            parsed_base = parse_version(base_version)
-            major = parsed_base.major
-            minor = parsed_base.minor
-            # Assuming the next release constraint is on minor bump
-            upper_bound = f"<{major}.{minor + 1}"
-            specifiers = f">={base_version},{upper_bound}"
-
-        # Handle "^" shorthand to translate to a compatible range
-        if specifiers.startswith("^"):
-            base_version = specifiers[1:]
-            parsed_base = parse_version(base_version)
-            major = parsed_base.major
-            minor = parsed_base.minor
-            patch = parsed_base.micro
+            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:
-                upper_bound = f"<{major + 1}.0.0"
-            elif minor > 0:
-                upper_bound = f"<0.{minor + 1}.0"
-            else:
-                upper_bound = f"<0.0.{patch + 1}"
-            specifiers = f">={base_version},{upper_bound}"
-
-        # Create a SpecifierSet with the given specifiers
-        spec_set = SpecifierSet(specifiers)
-
-        # Check if the version matches the specifier set
-        return version in spec_set
-
-    except Exception as e:
-        # Handle exceptions if the inputs are malformed or invalid
-        click.secho(f"Error comparing versions: {e}", fg="red")
+                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)
+
+        return parsed_version in specifier_set
+
+    except (InvalidVersion, InvalidSpecifier, TypeError) as e:
+        print(f"Version parsing error: {e}")
         return False
 
 

{jvcli-2.0.13.dist-info → jvcli-2.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.13
+Version: 2.0.15
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.

{jvcli-2.0.13.dist-info → jvcli-2.0.15.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jvcli/__init__.py,sha256=iP0a4m_Caa6fevXHBBUuG0B34jHhQlSABgEgRRknw7o,171
+jvcli/__init__.py,sha256=iSCiYNZIcwNAk36tylM6zmJ5NrQtETpE49Pe5ZDTPoI,171
 jvcli/api.py,sha256=gd-EP1e75e7HijyrP-EF6i_jjCo6YUeSbm1l5daKLfQ,10352
 jvcli/auth.py,sha256=p04T02ufqbENx_93oDPg3xsq7sv-Nabeq3YR1kLXfSg,1215
 jvcli/cli.py,sha256=VM_QGPiYfSdqOZ4n0YLZbrOwXm0d5lHmzv47MqTyBMc,1060
-jvcli/utils.py,sha256=NKWjjJ45NFlwT7QVMh1YMY2zfvGaJ_8LppG4D8QXCwA,7726
+jvcli/utils.py,sha256=sdVMBNPSI4985OdspmCxj0BVL61c6dwEQNwhvPJIiAU,7648
 jvcli/client/__init__.py,sha256=WGP05OBzZHReqENYs1qYqMnYvgAaNVW6KvGQvyB3NGs,85
 jvcli/client/app.py,sha256=2LGSY2R9GXXRNUu34wb_-i9hLOWbP34YbzgTEnBX-g8,6087
 jvcli/client/lib/__init__.py,sha256=_Wv8CNIxeIle_x0U9T6w9s5mPuOY9-0u69BvTEPXLUw,38
@@ -44,7 +44,7 @@ jvcli/templates/2.0.0/agent_info.yaml,sha256=3olXRQDQG-543o7zSWWT23kJsK29QGhdx6-
 jvcli/templates/2.0.0/agent_knowledge.yaml,sha256=hI0ifr0ICiZGce-oUFovBOmDWxGU1Z2M10WyZH_wS2g,284
 jvcli/templates/2.0.0/agent_memory.yaml,sha256=_MBgObZcW1UzwWuYQVJiPZ_7TvYbGrDgd-xMuzJEkVo,9
 jvcli/templates/2.0.0/project/README.md,sha256=cr6yHG1qEzO7xDFchEDpl8tKawVvF0tsUVTrWyxjiG4,1077
-jvcli/templates/2.0.0/project/env.example,sha256=aB3Wp-0fJV1o9WlFLjxjdA5fKMg2zBV-y8-nBm9Q-bk,396
+jvcli/templates/2.0.0/project/env.example,sha256=L58RTUlPccbY8W9yGAbYA_G3gG36KPElheq9ONKUK50,967
 jvcli/templates/2.0.0/project/gitignore.example,sha256=W-TIjt_iOIV0zI9bisMeJ4mvsD2Ko13jXnNKG2GlXIg,518
 jvcli/templates/2.0.0/project/globals.jac,sha256=CEt7L25wEZfE6TupqpM1ilHbtJMQQWExDQ5GJlkHPts,56
 jvcli/templates/2.0.0/project/main.jac,sha256=r37jsaGq-85YvDbHP3bQvBXk0u8w0rtRTZTNxZOjTW0,48
@@ -57,9 +57,9 @@ jvcli/templates/2.0.0/project/sh/inituser.sh,sha256=BYvLfFZdL0n7AGmjmoTQQcb236f5
 jvcli/templates/2.0.0/project/sh/serve.sh,sha256=EsXOqszYD5xa8fjAEwyYCz8mSTX-v5VfiTZeKUpOKYw,105
 jvcli/templates/2.0.0/project/sh/startclient.sh,sha256=3GbJtTxycLBUJGfX2_b3cfQoAPFzhvcJpWRtS2sSsRM,119
 jvcli/templates/2.0.0/project/tests/README.md,sha256=-1ZXkxuUKa6tMw_jlF3rpCvUFq8ijW2L-nSuAkbCANo,917
-jvcli-2.0.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvcli-2.0.13.dist-info/METADATA,sha256=5sZydra7NeSynQK9z7YRSisg2eE1rEYe9OAj_-hiK_M,4202
-jvcli-2.0.13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-jvcli-2.0.13.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
-jvcli-2.0.13.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
-jvcli-2.0.13.dist-info/RECORD,,
+jvcli-2.0.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvcli-2.0.15.dist-info/METADATA,sha256=tVp-zxw7lmmwqGfUJLpqa4nGI5Cf705kIamu6F_imk8,4202
+jvcli-2.0.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jvcli-2.0.15.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
+jvcli-2.0.15.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
+jvcli-2.0.15.dist-info/RECORD,,