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

jvcli/auth.py

@@ -3,6 +3,8 @@
 import json
 import os
 
+import requests
+
 TOKEN_FILE = os.path.expanduser("~/.jvcli_token")
 
 
@@ -43,3 +45,24 @@ def load_namespaces() -> str:
     """Load the namespaces from the token."""
     token = load_token()
     return token.get("namespaces", {}).get("default", "anonymous")
+
+
+def login_jivas() -> str:
+    """Login to Jivas and return the token."""
+    email = os.environ.get("JIVAS_USER")
+    password = os.environ.get("JIVAS_PASSWORD")
+    if not email or not password:
+        raise ValueError(
+            "JIVAS_USER and JIVAS_PASSWORD environment variables are required."
+        )
+
+    login_url = (
+        f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/login"
+    )
+    response = requests.post(login_url, json={"email": email, "password": password})
+    if response.status_code == 200:
+        data = response.json()
+        os.environ["JIVAS_TOKEN"] = data["token"]
+        return data["token"]
+    else:
+        raise ValueError(f"Login failed: {response.text}")

jvcli/cli.py

@@ -4,11 +4,13 @@ import click
 
 from jvcli import __version__
 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
 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
@@ -30,6 +32,8 @@ jvcli.add_command(info)
 jvcli.add_command(studio)
 jvcli.add_command(client)
 jvcli.add_command(startproject)
+jvcli.add_command(clean)
+jvcli.add_command(server)
 
 # Register standalone commands
 jvcli.add_command(signup)

jvcli/commands/clean.py

@@ -0,0 +1,29 @@
+"""Runs the jac clean command"""
+
+import subprocess
+
+import click
+
+
+@click.command(
+    help="Clean the Jac files in the current directory and subdirectories. This command executes 'jac clean', which removes compiled Jac artifacts and temporary files. "
+    "Use this command to ensure a clean state before rebuilding your Jac project."
+)
+@click.pass_context
+def clean(ctx: click.Context) -> None:
+    """Clean the Jac files in directory."""
+    try:
+        click.echo("Running jac clean in actions directory...")
+        result = subprocess.run(["jac", "clean"], check=True)
+        if result.returncode == 0:
+            click.echo("Successfully cleaned directory.")
+
+        else:
+            click.secho("Failed to clean directory.", fg="red")
+            ctx.exit(1)
+    except subprocess.CalledProcessError as e:
+        click.secho(f"Error running jac clean: {e}", fg="red")
+        ctx.exit(1)
+    except Exception as e:
+        click.secho(f"Unexpected error: {e}", fg="red")
+        ctx.exit(1)

jvcli/commands/server.py

@@ -0,0 +1,260 @@
+"""Server command group for interfacing with the Jivas Server."""
+
+import json
+import os
+import subprocess
+import sys
+from typing import Optional
+
+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()
+
+
+@click.group()
+def server() -> None:
+    """Group for interfacing with the Jivas Server."""
+    pass  # pragma: no cover
+
+
+@server.command()
+@click.option(
+    "--jac-file",
+    default="main.jac",
+    help="Path to the JAC file to run. Defaults to main.jac in the current directory.",
+)
+def launch(jac_file: str) -> None:
+    """Launch the Jivas Server by running the specified JAC file."""
+    click.echo(f"Launching Jivas Server with JAC file: {jac_file}...")
+    subprocess.call(["jac", "jvserve", jac_file])
+
+
+@server.command()
+@click.option(
+    "--email",
+    required=False,
+    help="Email address for Jivas login.",
+)
+@click.option(
+    "--password",
+    required=False,
+    hide_input=True,
+    help="Password for Jivas login.",
+)
+def login(email: Optional[str] = None, password: Optional[str] = None) -> Optional[str]:
+    """Login to Jivas Server and get an authentication token."""
+    email = os.environ.get("JIVAS_USER") or email
+    password = os.environ.get("JIVAS_PASSWORD") or password
+
+    if email is None:
+        email = click.prompt("Email")
+    if password is None:
+        password = click.prompt("Password", hide_input=True)
+
+    click.echo(f"Logging in to Jivas Server as {email}...")
+
+    login_url = (
+        f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/login"
+    )
+
+    try:
+        response = requests.post(login_url, json={"email": email, "password": password})
+        if response.status_code == 200:
+            data = response.json()
+            token = data["token"]
+            os.environ["JIVAS_TOKEN"] = token
+            click.secho("Login successful!", fg="green", bold=True)
+            click.echo(f"Token: {token}")
+            return token
+        else:
+            click.secho(f"Login failed: {response.text}", fg="red", bold=True)
+            return None
+    except Exception as e:
+        click.secho(f"Error connecting to Jivas Server: {str(e)}", fg="red", bold=True)
+        return None
+
+
+@server.command()
+@click.option(
+    "--email",
+    required=False,
+    help="Email address for the system admin.",
+)
+@click.option(
+    "--password",
+    required=False,
+    hide_input=True,
+    help="Password for the system admin.",
+)
+def createadmin(email: Optional[str] = None, password: Optional[str] = None) -> None:
+    """Create a system administrator account."""
+    email = os.environ.get("JIVAS_USER") or email
+    password = os.environ.get("JIVAS_PASSWORD") or password
+
+    if email is None:
+        email = click.prompt("Email")
+    if password is None:
+        password = click.prompt("Password", hide_input=True)
+
+    database_host = os.environ.get("DATABASE_HOST")
+
+    if not database_host:
+        click.echo("Database host is not set. Using signup endpoint...")
+        signup_url = (
+            f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/register"
+        )
+
+        try:
+            response = requests.post(
+                signup_url, json={"email": email, "password": password}
+            )
+            if response.status_code in (200, 201):
+                click.secho("Admin user created successfully!", fg="green", bold=True)
+                return response.json()
+            else:
+                click.secho(
+                    f"Failed to create admin: {response.text}", fg="red", bold=True
+                )
+        except Exception as e:
+            click.secho(
+                f"Error connecting to Jivas Server: {str(e)}", fg="red", bold=True
+            )
+    else:
+        click.echo("Creating system admin...")
+        try:
+            result = subprocess.call(
+                [
+                    "jac",
+                    "create_system_admin",
+                    "main.jac",
+                    "--email",
+                    email,
+                    "--password",
+                    password,
+                ]
+            )
+            if result == 0:
+                click.secho("Admin user created successfully!", fg="green", bold=True)
+            else:
+                click.secho("Failed to create admin user", fg="red", bold=True)
+        except Exception as e:
+            click.secho(f"Error running jac command: {str(e)}", fg="red", bold=True)
+
+
+@server.command()
+def initagents() -> None:
+    """
+    Initialize agents in the Jivas system.
+
+    Usage:
+        jvcli initagents
+    """
+
+    # Check if server is running
+    if not is_server_running():
+        click.secho("Server is not running. Please start the server first.", fg="red")
+        sys.exit(1)
+
+    # Login to Jivas
+    token = login_jivas()
+    if not token:
+        click.secho("Failed to login to Jivas.", fg="red")
+        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(
+            f"{os.environ['JIVAS_BASE_URL']}/walker/init_agents",
+            headers={
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                "Authorization": f"Bearer {token}",
+            },
+            json={},  # Add empty JSON object as request data
+        )
+
+        if response.status_code == 200:
+            data = response.json()
+            click.secho(f"Successfully initialized agents: {data}", fg="green")
+        else:
+            click.secho("Failed to initialize agents", fg="red")
+            sys.exit(1)
+    except requests.RequestException as e:
+        click.secho(f"Error during request: {e}", fg="red")
+        sys.exit(1)
+
+
+@server.command()
+@click.argument("agent_name")
+@click.argument("version", required=False)
+def importagent(agent_name: str, version: str) -> None:
+    """
+    Import an agent from a DAF package.
+
+    Usage:
+        jvcli importagent <agent_name> [--version <jivas_version>]
+    """
+
+    # Check if server is running
+    if not is_server_running():
+        click.secho("Server is not running. Please start the server first.", fg="red")
+        sys.exit(1)
+
+    # Login to Jivas
+    token = login_jivas()
+    if not token:
+        click.secho("Failed to login to Jivas.", fg="red")
+        sys.exit(1)
+    click.secho("Logged in to Jivas successfully.", fg="green")
+
+    # Check if version is provided
+    if not version:
+        version = "latest"
+
+    try:
+        response = requests.post(
+            f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/walker/import_agent",
+            json={"daf_name": agent_name, "daf_version": version},
+            headers={
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                "Authorization": f"Bearer {token}",
+            },
+        )
+
+        if response.status_code == 200:
+            try:
+                data = response.json()
+                agent_id = data.get("id")
+                if agent_id:
+                    click.secho(
+                        f"Successfully imported agent. Agent ID: {agent_id}", fg="green"
+                    )
+                else:
+                    click.secho(
+                        "Agent imported but no ID was returned in the response",
+                        fg="yellow",
+                    )
+            except json.JSONDecodeError:
+                click.secho("Invalid JSON response from server", fg="red")
+                sys.exit(1)
+        else:
+            click.secho(
+                f"Failed to import agent. Status: {response.status_code}", fg="red"
+            )
+            click.echo(response.text)
+            sys.exit(1)
+    except requests.RequestException as e:
+        click.secho(f"Request failed: {e}", fg="red")
+        sys.exit(1)

jvcli/commands/startproject.py

@@ -40,7 +40,6 @@ def startproject(project_name: str, version: str, no_env: bool) -> None:
         "tests": [],
         "actions": [],
         "daf": [],
-        "sh": [],
     }
 
     try: