jvcli 2.0.10__tar.gz → 2.0.12__tar.gz

{jvcli-2.0.10/jvcli.egg-info → jvcli-2.0.12}/PKG-INFO

@@ -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 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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-2.0.10 → jvcli-2.0.12}/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 → jvcli-2.0.12/jvcli.egg-info}/PKG-INFO

@@ -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