jvcli 2.0.8__tar.gz → 2.0.9__tar.gz

{jvcli-2.0.8/jvcli.egg-info → jvcli-2.0.9}/PKG-INFO

@@ -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 → jvcli-2.0.9}/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-2.0.8 → jvcli-2.0.9}/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-2.0.8 → jvcli-2.0.9}/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-2.0.9/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-2.0.9/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-2.0.9/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-2.0.9/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-2.0.9/jvcli/templates/2.0.0/project/sh/serve.sh

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

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

@@ -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 → jvcli-2.0.9}/jvcli.egg-info/SOURCES.txt

@@ -53,9 +53,12 @@ jvcli/templates/2.0.0/project/globals.jac
 jvcli/templates/2.0.0/project/main.jac
 jvcli/templates/2.0.0/project/actions/README.md
 jvcli/templates/2.0.0/project/daf/README.md
-jvcli/templates/2.0.0/project/sh/import_agent.sh
-jvcli/templates/2.0.0/project/sh/init.sh
+jvcli/templates/2.0.0/project/sh/exportenv.sh
+jvcli/templates/2.0.0/project/sh/importagent.sh
+jvcli/templates/2.0.0/project/sh/initagents.sh
+jvcli/templates/2.0.0/project/sh/inituser.sh
 jvcli/templates/2.0.0/project/sh/serve.sh
+jvcli/templates/2.0.0/project/sh/startclient.sh
 jvcli/templates/2.0.0/project/tests/README.md
 tests/test_api.py
 tests/test_auth.py

{jvcli-2.0.8 → jvcli-2.0.9}/tests/test_startproject.py

@@ -48,11 +48,15 @@ class TestStartProjectCommand:
             "README.md",
             "actions/README.md",
             "daf/README.md",
-            "sh/init.sh",
-            "sh/import_agent.sh",
+            "sh/initagents.sh",
+            "sh/importagent.sh",
             "sh/serve.sh",
+            "sh/exportenv.sh",
+            "sh/inituser.sh",
+            "sh/startclient.sh",
             "tests/README.md",
         ]
+
         mock_calls = mock_open.mock_calls
         written_files = [
             call.args[0] for call in mock_calls if "test_project" in str(call)

jvcli-2.0.8/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-2.0.8/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

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

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