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

jvcli/commands/startproject.py

@@ -23,6 +23,7 @@ def startproject(project_name: str, version: str) -> None:
     Usage:
         jvcli startproject <project_name> [--version <jivas_version>]
     """
+
     template_path = os.path.join(TEMPLATES_DIR, version, "project")
 
     if not os.path.exists(template_path):
@@ -61,9 +62,22 @@ def startproject(project_name: str, version: str) -> None:
                 with open(template_file_path, "r") as template_file:
                     contents = template_file.read()
 
-                # Write `.env` instead of `env.example`
+                if file_name == "gitignore.example":
+                    # Write `.gitignore`
+                    target_file_path_gitignore = os.path.join(target_dir, ".gitignore")
+                    with open(target_file_path_gitignore, "w") as gitignore_file:
+                        gitignore_file.write(contents)
+
                 if file_name == "env.example":
-                    target_file_path = os.path.join(target_dir, ".env")
+                    # Write `.env`
+                    target_file_path_env = os.path.join(target_dir, ".env")
+                    with open(target_file_path_env, "w") as env_file:
+                        env_file.write(contents)
+
+                    # Write `env.example`
+                    target_file_path_example = os.path.join(target_dir, "env.example")
+                    with open(target_file_path_example, "w") as example_file:
+                        example_file.write(contents)
 
                 with open(target_file_path, "w") as project_file:
                     project_file.write(contents)

jvcli/templates/2.0.0/project/gitignore.example

@@ -0,0 +1,53 @@
+# Python #
+*.pyc
+__pycache__
+venv
+.pytest_cache
+__jac_gen__
+
+# Distribution / packaging
+.Python
+play/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+test_source/
+
+# Others #
+.coverage
+.session
+*.session.db
+mydatabase/
+actions/jivas/
+.DS_Store
+.vscode
+build
+*Zone.Identifier
+.DS_Store
+parser.out
+codegen_output*
+.qodo
+.files
+*.rdb
+node_modules
+out.dot
+out.txt
+.jvdata
+.env
+
+# Mypy files #
+.mypy_cache*
+.jac_mypy_cache*

jvcli/templates/2.0.0/project/sh/importagent.sh

@@ -25,7 +25,7 @@ done
 # Check if JIVAS_TOKEN is set
 if [ -n "$JIVAS_TOKEN" ]; then
 
-    echo -e "\n\nImporting demo agent...\n"
+    echo -e "\n\nImporting agent...\n"
     # Import the agent
     AGENT_ID=$(curl --silent --show-error --no-progress-meter \
     --request POST \

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.12.dist-info → jvcli-2.0.14.dist-info}/METADATA

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

{jvcli-2.0.12.dist-info → jvcli-2.0.14.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jvcli/__init__.py,sha256=-IAJ0CzKiWPyUvcMlu_oGrkqBmXO7nkby6CEtUlPH3w,171
+jvcli/__init__.py,sha256=zpub8TOqlcUGsmZmx4-MW9dedXM7M0SnEwrcF6gAdqU,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
@@ -21,7 +21,7 @@ jvcli/commands/create.py,sha256=-9Lcng3Ef6AMZwBcuXDgvJCuvWxB_dB_fQF5-OBCkqA,1339
 jvcli/commands/download.py,sha256=AT6SFiJ9ysqNMDCdKsZ6CMUx96qpyzgraOk6EuNL2Qs,3417
 jvcli/commands/info.py,sha256=NyIDpR_AGMMSFPE0tFZv4dIuv_gwqrfd589zQAA_Q3s,2685
 jvcli/commands/publish.py,sha256=q1ihoL42GmEsU5ggHN3bcg8QD26kjRUZGfQpRzI2GMo,6630
-jvcli/commands/startproject.py,sha256=W7TzL8HALYd_Lzt3gLFFCZkBXZTR1jwUgZgLP6hETzI,2444
+jvcli/commands/startproject.py,sha256=WMYHdKq3EUMwTPmW9E9VZl1Fbt5UO9kpHlIM-Fab8Lg,3128
 jvcli/commands/studio.py,sha256=avD5M3Ss7R6AtUMN3Mk6AmTyPJ7LnXcmwQ0mbRzivrQ,8192
 jvcli/commands/update.py,sha256=LwCLg-W1b8WSdFkiiJ8WwTit2HJXTLpM5OQ4WBTe9C4,1997
 jvcli/studio/index.html,sha256=LGhVhKwe1FF_9r_PAG7J2ZPrRLFTwFH3PpCN_KdA-10,474
@@ -45,20 +45,21 @@ jvcli/templates/2.0.0/agent_knowledge.yaml,sha256=hI0ifr0ICiZGce-oUFovBOmDWxGU1Z
 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/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
 jvcli/templates/2.0.0/project/actions/README.md,sha256=TU1t-rOBH5WQP_HUWaEBLq5BbPv4jejtjIrwTW4hZwM,1742
 jvcli/templates/2.0.0/project/daf/README.md,sha256=M2_BLO6vFlsnUbYHPQMIrcoboe91MO9H9RR8yP9-tF8,1683
 jvcli/templates/2.0.0/project/sh/exportenv.sh,sha256=keFEu6HAROE8F9cOa5FxdIb2pryd22fED66rhaAvAuU,164
-jvcli/templates/2.0.0/project/sh/importagent.sh,sha256=Xe_6seVGF52iEO_jtsvX1N3GtYBhrbYHb58k7i1VG8w,1179
+jvcli/templates/2.0.0/project/sh/importagent.sh,sha256=isDMHR8ZEJEuwAAfJRc0xWhw8xHWetQNMeUqxCDOqx8,1174
 jvcli/templates/2.0.0/project/sh/initagents.sh,sha256=zFYlpt9G8kvYwGlBc-hJdz2TRQoLNY5Nq2Z_Vvto-NU,927
 jvcli/templates/2.0.0/project/sh/inituser.sh,sha256=BYvLfFZdL0n7AGmjmoTQQcb236f5wG68RMeVJiUyhFQ,1893
 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.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvcli-2.0.12.dist-info/METADATA,sha256=IJfoL6NnwDLsjd5hbruANnzh4osTGEqDXQccWKz3Ru4,4202
-jvcli-2.0.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-jvcli-2.0.12.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
-jvcli-2.0.12.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
-jvcli-2.0.12.dist-info/RECORD,,
+jvcli-2.0.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvcli-2.0.14.dist-info/METADATA,sha256=zQUANC3ZgDTlXfnenO_l9SftYuGFwlEIZtEQDZOTLG0,4202
+jvcli-2.0.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jvcli-2.0.14.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
+jvcli-2.0.14.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
+jvcli-2.0.14.dist-info/RECORD,,