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

jvcli/templates/2.0.0/project/README.md

@@ -15,10 +15,10 @@ sh sh/serve.sh
 To set up a demo agent, run the following command in another terminal:
 
 ```sh
-sh sh/importagent.sh
+sh sh/importagent.sh jivas/demo_ai
 ```
 
-This will initialize JIVAS, download, and install a demo agent.
+This will initialize JIVAS, download, and install a demo agent. If you wish to install any other agent, replace 'jivas/demo_ai' with the package name of your agent's DAF.
 
 ## Accessing the JIVAS Manager
 

jvcli/templates/2.0.0/project/sh/exportenv.sh

@@ -2,8 +2,8 @@
 
 # Export env vars
 set -o allexport
-if [ -f .env ]; then
-    source .env
+if [ -f ./.env ]; then
+    source ./.env
 else
     echo ".env file not found"
     exit 1

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

@@ -1,11 +1,26 @@
 #!/bin/bash
 # Script to create jivas user, login, and initialize jivas graph
 
+# Check if DAF_NAME is passed as a parameter
+if [ -z "$1" ]; then
+    echo "Usage: $0 <DAF_NAME>"
+    exit 1
+fi
+
+DAF_NAME="$1"
+
 # Export env vars
-source sh/exportenv.sh
+source ./sh/exportenv.sh
 
 # Init the user token
-source sh/inituser.sh
+source ./sh/inituser.sh
+
+# Wait until JIVAS_TOKEN is set
+while [ -z "$JIVAS_TOKEN" ]; do
+    echo "Waiting for JIVAS_TOKEN to be initialized..."
+    sleep 1
+    source ./sh/inituser.sh
+done
 
 # Check if JIVAS_TOKEN is set
 if [ -n "$JIVAS_TOKEN" ]; then
@@ -17,7 +32,7 @@ if [ -n "$JIVAS_TOKEN" ]; then
     --header 'Content-Type: application/json' \
     --header 'Accept: application/json' \
     --header "Authorization: Bearer $JIVAS_TOKEN" \
-    --data '{"daf_name": "jivas/eldon_ai"}' \
+    --data "{\"daf_name\": \"$DAF_NAME\"}" \
     "http://localhost:$JIVAS_PORT/walker/import_agent" | grep -o '"id":"[^"]*' | sed 's/"id":"//')
 
     if [ -z "$AGENT_ID" ]; then
@@ -30,7 +45,3 @@ else
     echo "Failed to initialize user token. Exiting..."
     exit 1
 fi
-
-
-
-

jvcli/templates/2.0.0/project/sh/initagents.sh

@@ -2,10 +2,10 @@
 # Script to authenticate and initialize jivas agents
 
 # Export env vars
-source sh/exportenv.sh
+source ./sh/exportenv.sh
 
 # Init the user token
-source sh/inituser.sh
+source ./sh/inituser.sh
 
 # Check if JIVAS_TOKEN is set
 if [ -n "$JIVAS_TOKEN" ]; then

jvcli/templates/2.0.0/project/sh/inituser.sh

@@ -7,7 +7,7 @@ if [ -z "$JIVAS_PORT" ] || [ -z "$JIVAS_PASSWORD" ] || [ -z "$JIVAS_USER" ]; the
     exit 1
 fi
 
-if lsof -i :$JIVAS_PORT >/dev/null; then
+if lsof -i :$JIVAS_PORT >/dev/null || netstat -an | grep -q ":$JIVAS_PORT .*LISTEN"; then
 
     # Try to login first
     JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
@@ -38,7 +38,7 @@ if lsof -i :$JIVAS_PORT >/dev/null; then
         --header 'Content-Type: application/json' \
         --header 'Accept: application/json' \
         --data '{"password": "'"$JIVAS_PASSWORD"'","email": "'"$JIVAS_USER"'"}' \
-        "http://localhost:$JIVAS_PORT/user/login" | grep -oP '(?<="token":")[^"]*')
+        "http://localhost:$JIVAS_PORT/user/login" | grep -o '"token":"[^"]*' | sed 's/"token":"//')
     fi
 
     # Print token

jvcli/templates/2.0.0/project/sh/serve.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Script to serve jivas app
 
-source sh/exportenv.sh
+source ./sh/exportenv.sh
 
 # serve jivas app
 jac jvserve main.jac

jvcli/templates/2.0.0/project/sh/startclient.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Script to serve jivas client app
 
-source sh/exportenv.sh
+source ./sh/exportenv.sh
 
 # launch jivas client app
 jvcli client launch

{jvcli-2.0.10.dist-info → jvcli-2.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.10
+Version: 2.0.12
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.
@@ -27,6 +27,7 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

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

@@ -1,4 +1,4 @@
-jvcli/__init__.py,sha256=au5GKsdfzG0naZMtQkPsR124zlXEwc09N443NJc0Ik8,171
+jvcli/__init__.py,sha256=-IAJ0CzKiWPyUvcMlu_oGrkqBmXO7nkby6CEtUlPH3w,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
@@ -43,22 +43,22 @@ jvcli/templates/2.0.0/agent_descriptor.yaml,sha256=h6_pxmaP-oJqLDCHAyZ1ckETfWD6D
 jvcli/templates/2.0.0/agent_info.yaml,sha256=3olXRQDQG-543o7zSWWT23kJsK29QGhdx6-tOLXvCk8,207
 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=HV0vVTsE9ELdfdqSpy6Xrn222u9z00rMNVsNPVTMSeA,956
+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/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=UXH0DkHJnVz75YvAU8tw9bqfa2atniUITd7f_3FDBfk,160
-jvcli/templates/2.0.0/project/sh/importagent.sh,sha256=plls5CY2TUcab7OVxZDPOIYO0vF4bn-yUIjPY1YL_GQ,886
-jvcli/templates/2.0.0/project/sh/initagents.sh,sha256=WmMshuxLw_dXnm23uhTZjr6Eyc9pAbktlo2R_0tXK6M,923
-jvcli/templates/2.0.0/project/sh/inituser.sh,sha256=TUg-NqWV3F6o-5nX0fn2L4xcVOn-vbDD-NIRFThAS1U,1828
-jvcli/templates/2.0.0/project/sh/serve.sh,sha256=S64Pmza1Zh5uf6bDA7aXS282AQsN3jJW4RAyfi7NCrU,103
-jvcli/templates/2.0.0/project/sh/startclient.sh,sha256=w_oW5DZ9NHRD4HR16lVQsvq8HPtiRNUKFuG2nUrKWlQ,117
+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/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.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvcli-2.0.10.dist-info/METADATA,sha256=nxnZ1oL_P_qvDBIoWTv5UntyIpHnIZVJRwUMMx8cv7k,4180
-jvcli-2.0.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-jvcli-2.0.10.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
-jvcli-2.0.10.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
-jvcli-2.0.10.dist-info/RECORD,,
+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.10.dist-info → jvcli-2.0.12.dist-info}/WHEEL

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