jvcli 2.0.31__py3-none-any.whl → 2.1.1__py3-none-any.whl

jvcli/__init__.py

@@ -4,5 +4,7 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.31"
-__supported__jivas__versions__ = ["2.0.0"]
+from importlib.metadata import version
+
+__version__ = version("jvcli")
+__supported__jivas__versions__ = [__version__]

jvcli/cli.py

@@ -2,9 +2,8 @@
 
 import click
 
-from jvcli import __version__
+from jvcli import __version__  # type: ignore[attr-defined]
 from jvcli.commands.auth import login, logout, signup
-from jvcli.commands.clean import clean
 from jvcli.commands.client import client
 from jvcli.commands.create import create
 from jvcli.commands.download import download
@@ -12,7 +11,6 @@ from jvcli.commands.info import info
 from jvcli.commands.publish import publish
 from jvcli.commands.server import server
 from jvcli.commands.startproject import startproject
-from jvcli.commands.studio import studio
 from jvcli.commands.update import update
 
 
@@ -29,11 +27,9 @@ jvcli.add_command(update)
 jvcli.add_command(download)
 jvcli.add_command(publish)
 jvcli.add_command(info)
-jvcli.add_command(studio)
-jvcli.add_command(client)
 jvcli.add_command(startproject)
-jvcli.add_command(clean)
 jvcli.add_command(server)
+jvcli.add_command(client)
 
 # Register standalone commands
 jvcli.add_command(signup)

jvcli/commands/client.py

@@ -1,50 +1,26 @@
-"""Client command group for deploying and interfacing with the Jivas Client."""
+"""Client command group for interfacing with the Jivas Client."""
 
-import os
 import subprocess
-from pathlib import Path
 
 import click
 
 
 @click.group()
 def client() -> None:
-    """Group for managing Jivas Client resources."""
+    """Group for interfacing with the Jivas Client."""
     pass  # pragma: no cover
 
 
 @client.command()
-@click.option("--port", default=8501, help="Port for the client to launch on.")
-@click.option(
-    "--jivas_url",
-    default=os.environ.get("JIVAS_BASE_URL", "http://localhost:8000"),
-    help="URL for the Jivas API.",
-)
-@click.option(
-    "--studio_url",
-    default=os.environ.get("JIVAS_STUDIO_URL", "http://localhost:8989"),
-    help="URL for the Jivas Studio.",
-)
-def launch(port: int, jivas_url: str, studio_url: str) -> None:
-    """Launch the Jivas Client."""
-    click.echo(
-        f"Launching Jivas Client on port {port}, loading action apps from {jivas_url}..."
-    )
-    os.environ["JIVAS_BASE_URL"] = jivas_url
-    os.environ["JIVAS_STUDIO_URL"] = studio_url
-    subprocess.call(
-        [
-            "streamlit",
-            "run",
-            "--server.port={}".format(port),
-            "--client.showSidebarNavigation=False",
-            "--client.showErrorDetails=False",
-            "--global.showWarningOnDirectExecution=False",
-            Path(__file__)
-            .resolve()
-            .parent.parent.joinpath("client")
-            .joinpath("app.py")
-            .resolve()
-            .__str__(),
-        ]
-    )
+def launch() -> None:
+    """Launch the Jivas Client by running the jvmanager launch command."""
+    click.echo("Launching Jivas Client...")
+    try:
+        subprocess.call(["jvmanager", "launch"])
+    except FileNotFoundError:
+        click.secho(
+            "Error: 'jvmanager' command not found. Make sure it is installed and in your PATH.",
+            fg="red",
+        )
+    except Exception as e:
+        click.secho(f"An error occurred: {e}", fg="red")

jvcli/commands/create.py

@@ -4,7 +4,7 @@ import os
 
 import click
 
-from jvcli import __supported__jivas__versions__
+from jvcli import __supported__jivas__versions__  # type: ignore[attr-defined]
 from jvcli.api import RegistryAPI
 from jvcli.auth import load_token, save_token
 from jvcli.utils import TEMPLATES_DIR, validate_name, validate_snake_case
@@ -93,7 +93,7 @@ def create_action(
     full_name = f"{namespace}/{name}"
 
     # Generate class name (CamelCase)
-    architype = "".join(word.capitalize() for word in name.split("_"))
+    archetype = "".join(word.capitalize() for word in name.split("_"))
 
     # Validate the Jivas version
     if str(jivas_version) not in __supported__jivas__versions__:
@@ -104,7 +104,9 @@ def create_action(
         return
 
     # Prepare the template path
-    template_path = os.path.join(TEMPLATES_DIR, jivas_version, "action_info.yaml")
+    template_path = os.path.join(
+        TEMPLATES_DIR, jivas_version, "sourcefiles", "action_info.yaml"
+    )
     if not os.path.exists(template_path):
         click.secho(
             f"Template for version {jivas_version} not found in {TEMPLATES_DIR}.",
@@ -126,7 +128,7 @@ def create_action(
     data = {
         "name": full_name,  # Include namespace in the package name
         "author": author,
-        "architype": architype,
+        "archetype": archetype,
         "version": version,
         "title": title,
         "description": description,
@@ -147,101 +149,89 @@ def create_action(
 
     # Create lib.jac
     lib_path = os.path.join(action_dir, "lib.jac")
-    with open(lib_path, "w") as file:
-        file.write(f"include:jac {name};\n")
+    lib_template_path = os.path.join(
+        TEMPLATES_DIR, jivas_version, "sourcefiles", "action_lib.jac"
+    )
+    if not os.path.exists(lib_template_path):
+        click.secho(
+            f"Lib template for version {jivas_version} not found in {TEMPLATES_DIR}.",
+            fg="red",
+        )
+        return
 
-    # Create action-specific .jac file
-    action_jac_path = os.path.join(action_dir, f"{name}.jac")
-    with open(action_jac_path, "w") as file:
-        node_class = {
-            "action": "Action",
-            "interact_action": "InteractAction",
-            "vector_store_action": "VectorStoreAction",
-        }[type]
-
-        import_statement = f"import:jac from agent.action.{type} {{ {node_class} }}"
-
-        abilities = """
-    #* (Abilities - Uncomment and implement as needed)
-    can on_register {
-        # override to execute operations upon registration of action
-    }
+    with open(lib_template_path, "r") as file:
+        lib_content = file.read()
 
-    can post_register {
-        # override to execute any setup code when all actions are in place
+    lib_data = {
+        "namespace": namespace,
+        "name": name,
+        "imports": name,
     }
 
-    can on_enable {
-        # override to execute operations upon enabling of action
-    }
+    for key, value in lib_data.items():
+        lib_content = lib_content.replace(f"{{{{{key}}}}}", str(value))
 
-    can on_disable {
-        # override to execute operations upon disabling of action
-    }
+    with open(lib_path, "w") as file:
+        file.write(lib_content)
 
-    can on_deregister {
-        # override to execute operations upon deregistration of action
-    }
+    # Create action-specific .jac file
+    action_jac_path = os.path.join(action_dir, f"{name}.jac")
+    if type == "action":
+        action_template_path = os.path.join(
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "action_archetype.jac"
+        )
+    elif type == "interact_action":
+        action_template_path = os.path.join(
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "interact_action_archetype.jac"
+        )
+    else:
+        action_template_path = os.path.join(
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "action_archetype.jac"
+        )
 
-    can touch(visitor: interact_graph_walker) -> bool {
-        # override to authorize, redirect or deny the interact walker from running execute
-    }
+    if not os.path.exists(action_template_path):
+        click.secho(
+            f"Action template for version {jivas_version} not found in {TEMPLATES_DIR}.",
+            fg="red",
+        )
+        return
 
-    can execute(visitor: interact_graph_walker) -> dict {
-        # override to implement action execution
-    }
+    with open(action_template_path, "r") as file:
+        node_content = file.read()
 
-    can pulse() {
-        # override to implement pulse operation
+    action_data = {
+        "archetype": archetype,
     }
-    *#
-    """
-        node_content = f"""
-# Define your custom action code here
-{import_statement}
 
-node {architype} :{node_class}: {{
-    # Declare your has variables to be persisted here
-    # e.g has var_a : str = "string";
+    for key, value in action_data.items():
+        node_content = node_content.replace(f"{{{{{key}}}}}", str(value))
 
-{abilities}
-}}
-        """
+    with open(action_jac_path, "w") as file:
         file.write(node_content.strip())
 
     # Create the 'app' folder and default 'app.py'
     app_dir = os.path.join(action_dir, "app")
     os.makedirs(app_dir, exist_ok=True)
     app_file_path = os.path.join(app_dir, "app.py")
-    with open(app_file_path, "w") as app_file:
-        app_code = """
-\"\"\" This module renders the streamlit app for the {title}. \"\"\"
-
-from jvcli.client.lib.widgets import app_controls, app_header, app_update_action
-
-from streamlit_router import StreamlitRouter
-
-def render(router: StreamlitRouter, agent_id: str, action_id: str, info: dict) -> None:
-    \"\"\"Render the Streamlit app for the {title}.
-    :param router: The StreamlitRouter instance
-    :param agent_id: The agent ID
-    :param action_id: The action ID
-    :param info: The action info dict
-    \"\"\"
+    app_template_path = os.path.join(
+        TEMPLATES_DIR, jivas_version, "sourcefiles", "action_app.py"
+    )
 
-    # Add app header controls
-    (model_key, action) = app_header(agent_id, action_id, info)
+    if not os.path.exists(app_template_path):
+        click.secho(
+            f"App template for version {jivas_version} not found in {TEMPLATES_DIR}.",
+            fg="red",
+        )
+        return
 
-    # Add app main controls
-    app_controls(agent_id, action_id)
+    with open(app_template_path, "r") as file:
+        app_code = file.read()
 
-    # Add update button to apply changes
-    app_update_action(agent_id, action_id)
-        """
-        app_code = app_code.replace("{title}", title)
+    app_code = app_code.replace("{{title}}", title)
+    with open(app_file_path, "w") as app_file:
         app_file.write(app_code)
 
-        create_docs(action_dir, title, version, "action", description)
+    create_docs(action_dir, title, version, "action", jivas_version, description)
 
     click.secho(
         f"Action '{name}' created successfully in {action_dir}!", fg="green", bold=True
@@ -336,6 +326,8 @@ def create_agent(
 ) -> None:
     """Create a new agent with its folder and associated files."""
 
+    title = name.replace("_", " ").title()
+
     # Retrieve token info
     token = load_token()
     namespace = namespace or token.get("namespaces", {}).get("default", "anonymous")
@@ -356,14 +348,18 @@ def create_agent(
 
     # Load templates
     template_paths = {
-        "info.yaml": os.path.join(TEMPLATES_DIR, jivas_version, "agent_info.yaml"),
+        "info.yaml": os.path.join(
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "agent_info.yaml"
+        ),
         "descriptor.yaml": os.path.join(
-            TEMPLATES_DIR, jivas_version, "agent_descriptor.yaml"
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "agent_descriptor.yaml"
         ),
         "knowledge.yaml": os.path.join(
-            TEMPLATES_DIR, jivas_version, "agent_knowledge.yaml"
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "agent_knowledge.yaml"
+        ),
+        "memory.yaml": os.path.join(
+            TEMPLATES_DIR, jivas_version, "sourcefiles", "agent_memory.yaml"
         ),
-        "memory.yaml": os.path.join(TEMPLATES_DIR, jivas_version, "agent_memory.yaml"),
     }
 
     # Check if all templates exist
@@ -383,7 +379,7 @@ def create_agent(
         "name": f"{namespace}/{name}",
         "author": author,
         "version": version,
-        "title": name.replace("_", " ").title(),
+        "title": title,
         "description": description,
         "type": "agent",
         "jivas_version": jivas_version,
@@ -397,7 +393,7 @@ def create_agent(
             file.write(template_content)
 
     # Create documentation
-    create_docs(daf_dir, name, version, "agent", description)
+    create_docs(daf_dir, title, version, "agent", jivas_version, description)
 
     # Success message
     click.secho(
@@ -406,18 +402,25 @@ def create_agent(
 
 
 def create_docs(
-    path: str, name: str, version: str, package_type: str, description: str = ""
+    path: str,
+    title: str,
+    version: str,
+    package_type: str,
+    jivas_version: str,
+    description: str = "",
 ) -> None:
     """Update README.md and CHANGELOG.md templates with name and version."""
 
     # Create README
-    readme_template = os.path.join(TEMPLATES_DIR, "README.md")
+    readme_template = os.path.join(
+        TEMPLATES_DIR, jivas_version, "sourcefiles", "README.md"
+    )
     if os.path.exists(readme_template):
         with open(readme_template, "r") as file:
             readme_content = file.read()
 
         readme_content = readme_content.replace("{{version}}", version)
-        readme_content = readme_content.replace("{{name}}", name)
+        readme_content = readme_content.replace("{{title}}", title)
         readme_content = readme_content.replace("{{description}}", description)
 
         target_readme = os.path.join(path, "README.md")
@@ -425,7 +428,9 @@ def create_docs(
             file.write(readme_content)
 
     # Create CHANGELOG
-    changelog_template = os.path.join(TEMPLATES_DIR, "CHANGELOG.md")
+    changelog_template = os.path.join(
+        TEMPLATES_DIR, jivas_version, "sourcefiles", "CHANGELOG.md"
+    )
     if os.path.exists(changelog_template):
         with open(changelog_template, "r") as file:
             changelog_content = file.read()

jvcli/commands/server.py

@@ -10,7 +10,6 @@ import click
 import requests
 
 from jvcli.auth import login_jivas
-from jvcli.commands.clean import clean
 from jvcli.utils import is_server_running, load_env_if_present
 
 load_env_if_present()
@@ -167,11 +166,6 @@ def initagents() -> None:
         sys.exit(1)
     click.secho("Logged in to Jivas successfully.", fg="green")
 
-    # Run jvcli clean command
-    click.secho("Cleaning Jac files before initializing agents...", fg="blue")
-    ctx = click.Context(clean, info_name="clean")
-    clean.invoke(ctx)
-
     # Initialize agents
     try:
         response = requests.post(

jvcli/commands/startproject.py

@@ -4,7 +4,7 @@ import os
 
 import click
 
-from jvcli import __supported__jivas__versions__
+from jvcli import __supported__jivas__versions__  # type: ignore[attr-defined]
 from jvcli.utils import TEMPLATES_DIR
 
 

jvcli/templates/{2.0.0 → 2.1.1}/project/README.md

@@ -86,17 +86,6 @@ This command creates a directory structure with:
 - Main JAC file for your JIVAS application
 - Configuration files and shell scripts for easy management
 
-#### `jvcli clean`
-
-Clean the Jac files in the current directory and subdirectories by removing compiled artifacts and temporary files.
-
-```sh
-# Clean the current directory
-jvcli clean
-```
-
-This command executes `jac clean` under the hood and ensures your project is in a clean state before rebuilding or deploying.
-
 ### Create Commands
 
 Create commands help you generate new resources like actions, agents, and namespaces with the proper structure and configuration.
@@ -457,8 +446,7 @@ jvcli server initagents
 This command:
 1. Checks if the server is running
 2. Logs in to the server
-3. Cleans JAC files before reinitializing
-4. Sends a request to the server to reinitialize all agents
+3. Sends a request to the server to reinitialize all agents
 
 #### `jvcli server importagent`
 
@@ -482,31 +470,6 @@ This command:
 3. Sends a request to import the specified agent
 4. Displays the agent ID upon successful import
 
-### Studio Commands
-
-Studio commands help you manage the Jivas Studio, a web-based development environment for Jivas.
-
-#### `jvcli studio launch`
-
-Launch the Jivas Studio on a specified port. Jivas Studio provides a visual interface for building and managing agents.
-
-```sh
-# Launch with default settings
-jvcli studio launch
-
-# Launch on a custom port
-jvcli studio launch --port 9000
-
-# Launch with authentication required
-jvcli studio launch --require-auth
-```
-
-Options:
-- `--port`: Port for the studio to launch on (default: 8989)
-- `--require-auth`: Require authentication for studio API access (default: false)
-
-When launched, the Studio will be accessible via a web browser at `http://localhost:<port>`.
-
 ### Client Commands
 
 Client commands help you manage the Jivas Client, which provides a user interface for interacting with agents.
@@ -523,8 +486,9 @@ jvcli client launch
 jvcli client launch --port 9001
 
 # Launch with custom server URLs
-jvcli client launch \
-  --jivas_url http://my-server:8000 \
+# Launch with custom server URLs
+jvcli client launch
+  --jivas_url http://my-server:8000
   --studio_url http://my-studio:8989
 ```
 

jvcli/templates/{2.0.0 → 2.1.1}/project/actions/README.md

@@ -20,7 +20,7 @@ To create a custom action using `jvcli`, follow these steps:
 
 2. **Options**: You can customize the creation process with various options:
     - `--version`: Specify the version of the action. Default is `0.0.1`.
-    - `--jivas_version`: Specify the version of Jivas. Default is `2.0.0`.
+    - `--jivas_version`: Specify the version of Jivas. Default is `2.1.0`.
     - `--type`: Define the type of action (`action`, `interact_action`, or `vector_store_action`). Default is `action`.
     - `--singleton`: Indicate if the action is singleton. Default is `True`.
     - `--path`: Directory to create the action folder in. Default is `./actions`.

jvcli/templates/{2.0.0 → 2.1.1}/project/daf/README.md

@@ -20,7 +20,7 @@ To create a new DAF package using `jvcli`, follow these steps:
 
 2. **Options**: You can customize the creation process with various options:
     - `--version`: Specify the version of the agent. Default is `0.0.1`.
-    - `--jivas_version`: Specify the version of Jivas. Default is `2.0.0`.
+    - `--jivas_version`: Specify the version of Jivas. Default is `2.1.0`.
     - `--path`: Directory to create the agent folder in. Default is `./daf`.
     - `--namespace`: Namespace for the agent. Defaults to the username in the token.
 

jvcli/templates/{2.0.0 → 2.1.1}/project/env.example

@@ -4,17 +4,15 @@ JIVAS_ENVIRONMENT=development
 JIVAS_USER=admin@jivas.com
 JIVAS_PASSWORD=password
 JIVAS_PORT=8000
-JIVAS_DESCRIPTOR_ROOT_PATH=".jvdata"
 JIVAS_ACTIONS_ROOT_PATH="actions"
 JIVAS_DAF_ROOT_PATH="daf"
 JIVAS_BASE_URL=http://127.0.0.1:8000
-JIVAS_STUDIO_URL=http://127.0.0.1:8989
 JACPATH="./"
 
 # JIVAS Files Serving Config
 JIVAS_FILE_INTERFACE="local"
 JIVAS_FILES_ROOT_PATH=".files"
-JIVAS_FILES_URL=http://127.0.0.1:9000/files
+JIVAS_FILES_URL=http://127.0.0.1:8000/files
 
 # S3 Config
 # JIVAS_S3_ENDPOINT=access_key_id # optional
@@ -31,6 +29,11 @@ TOKEN_SECRET=s3cr3t
 # DATABASE_HOST=mongodb://localhost:27017/?replicaSet=my-rs # If running MongoDB exposed on localhost, replace with the actual host and replaceSet name
 # DATABASE_HOST=mongodb://mongodb:27017/?replicaSet=my-rs # If running MongoDB in a container named mongodb, replace with the actual host and replaceSet name
 
+# Redis Config
+# REDIS_PORT=6379
+# REDIS_USER=default
+# REDIS_HOST=redis://localhost
+
 # Typesense Config
 # TYPESENSE_HOST=localhost
 # TYPESENSE_PORT=8108
@@ -40,4 +43,4 @@ TOKEN_SECRET=s3cr3t
 
 # WPP Config
 # WPP_API_URL="http://localhost:21465/api"
-# WPP_SECRET_KEY="THISISMYSECURETOKEN"
+# WPP_SECRET_KEY="THISISMYSECURETOKEN"

jvcli/templates/2.1.1/project/main.jac

@@ -0,0 +1,2 @@
+import globals;
+include jivas.agent.lib;

jvcli/templates/2.1.1/sourcefiles/action_app.py

@@ -0,0 +1,23 @@
+"""This module renders the streamlit app for the {{title}}."""
+
+from streamlit_router import StreamlitRouter
+
+from jvcli.client.lib.widgets import app_controls, app_header, app_update_action
+
+
+def render(router: StreamlitRouter, agent_id: str, action_id: str, info: dict) -> None:
+    """Render the Streamlit app for the {{title}}.
+    :param router: The StreamlitRouter instance
+    :param agent_id: The agent ID
+    :param action_id: The action ID
+    :param info: The action info dict
+    """
+
+    # Add app header controls
+    (model_key, action) = app_header(agent_id, action_id, info)
+
+    # Add app main controls
+    app_controls(agent_id, action_id)
+
+    # Add update button to apply changes
+    app_update_action(agent_id, action_id)

jvcli/templates/2.1.1/sourcefiles/action_archetype.jac

@@ -0,0 +1,49 @@
+import logging;
+import traceback;
+import from typing { Union }
+import from logging { Logger }
+import from jivas.agent.action.action { Action }
+
+node {{archetype}}(Action) {
+
+    # Declare your has variables to be persisted here
+    # e.g has var_a : str = "string";
+
+    # set up logger
+    static has logger:Logger = logging.getLogger(__name__);
+
+    def healthcheck() -> Union[bool, dict] {
+        # override to implement healthcheck operation
+        # optionally returns a dict of (status:bool, severity:str [error|warning], message:str) if more information is needed
+        return True;
+    }
+    #*
+
+    (Optional Abilities - Uncomment and implement as needed)
+
+    # override to execute operations upon registration of action
+    def on_register() { }
+
+    # override to execute operations upon the reload of action
+    def on_reload() { }
+
+    # override to execute any setup code when all actions are in place
+    def post_register() { }
+
+    # override to execute operations upon enabling of action
+    def on_enable() { }
+
+    # override to execute operations upon disabling of action
+    def on_disable() { }
+
+    # override to execute operations upon deregistration of action
+    def on_deregister() { }
+
+    # override to implement pulse operation
+    def pulse() { }
+
+    # override to furnish analytics data for the action
+    def analytics() { }
+
+    *#
+}

jvcli/templates/{2.0.0 → 2.1.1/sourcefiles}/action_info.yaml

@@ -1,7 +1,7 @@
 package:
   name: "{{name}}"
   author: "{{author}}"
-  architype: "{{architype}}"
+  archetype: "{{archetype}}"
   version: "{{version}}"
   meta:
     title: "{{title}}"

jvcli/templates/2.1.1/sourcefiles/action_lib.jac

@@ -0,0 +1,3 @@
+import from actions.{{namespace}}.{{name}} {
+    {{imports}}
+}