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

jvcli/client/app.py

@@ -26,8 +26,6 @@ def login_form() -> None:
     """Render the login form and handle login logic."""
     login_url = f"{JIVAS_URL}/user/login"
 
-    st.write(os.environ.get("JIVAS_ENVIRONMENT"))
-
     if os.environ.get("JIVAS_ENVIRONMENT") == "development":
         email = os.environ.get("JIVAS_USER", "admin@jivas.com")
         password = os.environ.get("JIVAS_PASSWORD", "password")

jvcli/templates/2.0.0/project/README.md

@@ -15,7 +15,7 @@ sh sh/serve.sh
 To set up a demo agent, run the following command in another terminal:
 
 ```sh
-sh sh/import_agent.sh
+sh sh/importagent.sh
 ```
 
 This will initialize JIVAS, download, and install a demo agent.
@@ -25,7 +25,7 @@ This will initialize JIVAS, download, and install a demo agent.
 Once the setup is complete, run the following command in its own terminal to access the JIVAS manager for configuring and chatting with your agent:
 
 ```sh
-jvcli client launch
+sh sh/startclient.sh
 ```
 
 ## Reflecting Changes to Agent Actions
@@ -33,7 +33,7 @@ jvcli client launch
 If you make any changes to the agent actions, run the following command to reinitialize all agents running within this JIVAS app:
 
 ```sh
-sh sh/init.sh
+sh sh/initagents.sh
 ```
 
 ## Logging In

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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Export env vars
+set -o allexport
+if [ -f .env ]; then
+    source .env
+else
+    echo ".env file not found"
+    exit 1
+fi
+set +o allexport
+printenv

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

@@ -0,0 +1,36 @@
+#!/bin/bash
+# Script to create jivas user, login, and initialize jivas graph
+
+# Export env vars
+source sh/exportenv.sh
+
+# Init the user token
+source sh/inituser.sh
+
+# Check if JIVAS_TOKEN is set
+if [ -n "$JIVAS_TOKEN" ]; then
+
+    echo -e "\n\nImporting demo agent...\n"
+    # Import the agent
+    AGENT_ID=$(curl --silent --show-error --no-progress-meter \
+    --request POST \
+    --header 'Content-Type: application/json' \
+    --header 'Accept: application/json' \
+    --header "Authorization: Bearer $JIVAS_TOKEN" \
+    --data '{"daf_name": "jivas/eldon_ai"}' \
+    "http://localhost:$JIVAS_PORT/walker/import_agent" | grep -o '"id":"[^"]*' | sed 's/"id":"//')
+
+    if [ -z "$AGENT_ID" ]; then
+        echo "Failed to import agent. Exiting..."
+        exit 1
+    fi
+
+    echo -e "Agent ID: $AGENT_ID\n"
+else
+    echo "Failed to initialize user token. Exiting..."
+    exit 1
+fi
+
+
+
+

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

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Script to authenticate and initialize jivas agents
+
+# Export env vars
+source sh/exportenv.sh
+
+# Init the user token
+source sh/inituser.sh
+
+# Check if JIVAS_TOKEN is set
+if [ -n "$JIVAS_TOKEN" ]; then
+
+    echo -e "\n\Initializing agents...\n"
+
+    # Initialize agents and capture the response
+    response=$(curl --silent --show-error --no-progress-meter \
+    --request POST \
+    -H 'accept: application/json' \
+    -H 'Content-Type: application/json' \
+    -H "Authorization: Bearer $JIVAS_TOKEN" \
+    --data '{"reporting":"true"}' \
+    "http://localhost:$JIVAS_PORT/walker/init_agents")
+
+    # Parse the response to extract the list of "id"s without using jq
+    ids=$(echo "$response" | grep -o '"id":"[^"]*"' | sed -e 's/"id":"//g' -e 's/"//g')
+
+    # Output the list of "id"s
+    echo "Initialized Agents:"
+    echo "$ids \n"
+
+else
+    echo "Failed to initialize user token. Exiting..."
+    exit 1
+fi

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

@@ -0,0 +1,50 @@
+#!/bin/bash
+# Script to init jivas user and grab token
+
+# Check if required environment variables are set
+if [ -z "$JIVAS_PORT" ] || [ -z "$JIVAS_PASSWORD" ] || [ -z "$JIVAS_USER" ]; then
+    echo "Required environment variables (JIVAS_PORT, JIVAS_PASSWORD, JIVAS_USER) are not set. Exiting..."
+    exit 1
+fi
+
+if lsof -i :$JIVAS_PORT >/dev/null; then
+
+    # Try to login first
+    JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
+    --request POST \
+    --header 'Content-Type: application/json' \
+    --header 'Accept: application/json' \
+    --data '{"password": "'"$JIVAS_PASSWORD"'","email": "'"$JIVAS_USER"'"}' \
+    "http://localhost:$JIVAS_PORT/user/login" | grep -o '"token":"[^"]*' | sed 's/"token":"//')
+
+    # Check if login was successful
+    if [ -z "$JIVAS_TOKEN" ] || [ "$JIVAS_TOKEN" == "null" ]; then
+        echo "Login failed. Registering user..."
+
+        # Register user if login failed
+        curl --silent --show-error --no-progress-meter \
+        --request POST \
+        --header 'Content-Type: application/json' \
+        --header 'Accept: application/json' \
+        --data '{
+        "password": "'"$JIVAS_PASSWORD"'",
+        "email": "'"$JIVAS_USER"'"
+        }' \
+        "http://localhost:$JIVAS_PORT/user/register"
+
+        # Attempt to login again after registration
+        JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
+        --request POST \
+        --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":")[^"]*')
+    fi
+
+    # Print token
+    echo "\n JIVAS token: $JIVAS_TOKEN"
+
+else
+    echo "Server is not running on port $JIVAS_PORT. Exiting..."
+    exit 1
+fi

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Script to serve jivas app
 
-# Export env vars
-set -o allexport; source .env; set +o allexport
+source sh/exportenv.sh
+
 # serve jivas app
 jac jvserve main.jac

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

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

{jvcli-2.0.8.dist-info → jvcli-2.0.9.dist-info}/METADATA

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

{jvcli-2.0.8.dist-info → jvcli-2.0.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
-jvcli/__init__.py,sha256=2oaCnW51txGusN4sNuCwyd8pG8YiFnSVolCBHy82XDc,170
+jvcli/__init__.py,sha256=HeFeEm0rZYsskrT6bwn8VkX3J-OUrBUbWtBz1JKUgww,170
 jvcli/api.py,sha256=yehboQFyoy6hMhBXBnyK4B3nd2bThLUoUQ2G2PrPl6I,11476
 jvcli/auth.py,sha256=p04T02ufqbENx_93oDPg3xsq7sv-Nabeq3YR1kLXfSg,1215
 jvcli/cli.py,sha256=VM_QGPiYfSdqOZ4n0YLZbrOwXm0d5lHmzv47MqTyBMc,1060
 jvcli/utils.py,sha256=NKWjjJ45NFlwT7QVMh1YMY2zfvGaJ_8LppG4D8QXCwA,7726
 jvcli/client/__init__.py,sha256=WGP05OBzZHReqENYs1qYqMnYvgAaNVW6KvGQvyB3NGs,85
-jvcli/client/app.py,sha256=4CsN2-X79dwgYt2Xb2DF3Yk5StZQWse2Zw2HY6-wX8Y,6138
+jvcli/client/app.py,sha256=2LGSY2R9GXXRNUu34wb_-i9hLOWbP34YbzgTEnBX-g8,6087
 jvcli/client/lib/__init__.py,sha256=_Wv8CNIxeIle_x0U9T6w9s5mPuOY9-0u69BvTEPXLUw,38
 jvcli/client/lib/page.py,sha256=QF53ffO4A2P9QTdPFfi0baCpKyEMmfkLyhJNxm7pTb0,2225
 jvcli/client/lib/utils.py,sha256=QwG5Ev_8Xd5f5j1DsIR2by4EhOMJ9Yi-UIMezGolU5g,9823
@@ -37,19 +37,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=HC9NTidIti2PDNsot1W_Dm2Fwa6uDnRlk3gepCHb3js,950
+jvcli/templates/2.0.0/project/README.md,sha256=HV0vVTsE9ELdfdqSpy6Xrn222u9z00rMNVsNPVTMSeA,956
 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/import_agent.sh,sha256=q2-cRyn0B0GVfWf3g5_Z9f1Oq7ELWTPo8PJvf1DLlhE,2442
-jvcli/templates/2.0.0/project/sh/init.sh,sha256=XV0tM7YXlVxAo2cLjscqQ0WYTbFR8MX9mBEDWWlEvRQ,2341
-jvcli/templates/2.0.0/project/sh/serve.sh,sha256=Dz8tRsUoUevbDYlTa-9zVgH__LNF0DzpiZuc-A5Tz1g,145
+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/tests/README.md,sha256=-1ZXkxuUKa6tMw_jlF3rpCvUFq8ijW2L-nSuAkbCANo,917
-jvcli-2.0.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvcli-2.0.8.dist-info/METADATA,sha256=QypBlVoIbK9qCeM2Y8ygqSjkoejTVTgL8Af1t2aoCuo,4179
-jvcli-2.0.8.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-jvcli-2.0.8.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
-jvcli-2.0.8.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
-jvcli-2.0.8.dist-info/RECORD,,
+jvcli-2.0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvcli-2.0.9.dist-info/METADATA,sha256=eQCVbFhqZS_xsGdpMz7El9flmwAohpOyPmRUQHvhc3E,4179
+jvcli-2.0.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+jvcli-2.0.9.dist-info/entry_points.txt,sha256=XunGcL0LWmIMIytaUckUA27czEf8M2Y4aTOfYIpOgrQ,42
+jvcli-2.0.9.dist-info/top_level.txt,sha256=akZnN9Zy1dFT93N0ms-C8ZXUn-xlhq37nO3jSRp0Y6o,6
+jvcli-2.0.9.dist-info/RECORD,,

jvcli/templates/2.0.0/project/sh/import_agent.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-# Script to create jivas user, login, and initialize jivas graph
-
-function initialize() {
-
-    if lsof -i :$JIVAS_PORT >/dev/null; then
-        # Try to login first
-        JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
-        --request POST \
-        --header 'Content-Type: application/json' \
-        --header 'Accept: application/json' \
-        --data '{"password": "'"$JIVAS_PASSWORD"'","email": "'"$JIVAS_USER"'"}' \
-        "http://localhost:$JIVAS_PORT/user/login" | grep -o '"token":"[^"]*' | sed 's/"token":"//')
-
-        echo $JIVAS_TOKEN
-
-        # Check if login was successful
-        if [ -z "$JIVAS_TOKEN" ] || [ "$JIVAS_TOKEN" == "null" ]; then
-            echo "Login failed. Registering user..."
-
-            # Register user if login failed
-            curl --silent --show-error --no-progress-meter \
-            --request POST \
-            --header 'Content-Type: application/json' \
-            --header 'Accept: application/json' \
-            --data '{
-            "password": "'"$JIVAS_PASSWORD"'",
-            "email": "'"$JIVAS_USER"'"
-            }' \
-            "http://localhost:$JIVAS_PORT/user/register"
-
-            # Attempt to login again after registration
-            JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
-            --request POST \
-            --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":")[^"]*')
-        fi
-
-        # Print token
-        echo "Jivas token: $JIVAS_TOKEN"
-
-        echo -e "\n\nImporting demo agent...\n"
-        # Import the agent
-        AGENT_ID=$(curl --silent --show-error --no-progress-meter \
-        --request POST \
-        --header 'Content-Type: application/json' \
-        --header 'Accept: application/json' \
-        --header "Authorization: Bearer $JIVAS_TOKEN" \
-        --data '{"daf_name": "jivas/eldon_ai"}' \
-        "http://localhost:$JIVAS_PORT/walker/import_agent" | grep -o '"id":"[^"]*' | sed 's/"id":"//')
-
-        echo "$AGENT_ID\n"
-    else
-        echo "Server is not running on port $JIVAS_PORT. Waiting..."
-    fi
-
-    exit
-}
-
-# Main loop to check if a process is running on port $JIVAS_PORT
-while true; do
-    initialize
-    sleep 2  # Wait for 2 seconds before checking again
-done

jvcli/templates/2.0.0/project/sh/init.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-# Script to create jivas user, login, and initialize jivas graph
-
-function initialize() {
-
-    if lsof -i :$JIVAS_PORT >/dev/null; then
-
-        # Try to login first
-        JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
-        --request POST \
-        --header 'Content-Type: application/json' \
-        --header 'Accept: application/json' \
-        --data '{"password": "'"$JIVAS_PASSWORD"'","email": "'"$JIVAS_USER"'"}' \
-        "http://localhost:$JIVAS_PORT/user/login" | grep -o '"token":"[^"]*' | sed 's/"token":"//')
-
-        echo $JIVAS_TOKEN
-
-        # Check if login was successful
-        if [ -z "$JIVAS_TOKEN" ] || [ "$JIVAS_TOKEN" == "null" ]; then
-            echo "Login failed. Registering user..."
-
-            # Register user if login failed
-            curl --silent --show-error --no-progress-meter \
-            --request POST \
-            --header 'Content-Type: application/json' \
-            --header 'Accept: application/json' \
-            --data '{
-            "password": "'"$JIVAS_PASSWORD"'",
-            "email": "'"$JIVAS_USER"'"
-            }' \
-            "http://localhost:$JIVAS_PORT/user/register"
-
-            # Attempt to login again after registration
-            JIVAS_TOKEN=$(curl --silent --show-error --no-progress-meter \
-            --request POST \
-            --header 'Content-Type: application/json' \
-            --header 'Accept: application/json' \
-            --data '{"password": "'"$JIVAS_PASSWORD"'","email": "'"$JIVAS_USER"'"}' \
-            "http://localhost:$JIVAS_PORT/user/login" | grep -o '"token":"[^"]*' | sed 's/"token":"//')
-        fi
-
-
-        # Print token
-        echo "Jivas token: $JIVAS_TOKEN"
-
-        echo "Initializing jivas graph..."
-
-        # Initialize agents
-        curl --silent --show-error --no-progress-meter \
-        --request POST \
-        -H 'accept: application/json' \
-        -H 'Content-Type: application/json' \
-        -H "Authorization: Bearer $JIVAS_TOKEN" \
-        --data '{}' \
-        "http://localhost:$JIVAS_PORT/walker/init_agents"
-
-        exit
-
-    else
-        echo "Server is not running on port $JIVAS_PORT. Waiting..."
-    fi
-
-    exit
-}
-
-# Main loop to check if a process is running on port $JIVAS_PORT
-while true; do
-    initialize
-    sleep 2  # Wait for 2 seconds before checking again
-done