jvcli 2.0.28__tar.gz → 2.0.30__tar.gz

{jvcli-2.0.28/jvcli.egg-info → jvcli-2.0.30}/PKG-INFO

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

{jvcli-2.0.28 → jvcli-2.0.30}/jvcli/__init__.py

@@ -4,5 +4,5 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.28"
+__version__ = "2.0.30"
 __supported__jivas__versions__ = ["2.0.0"]

{jvcli-2.0.28 → jvcli-2.0.30}/jvcli/client/lib/utils.py

@@ -57,6 +57,7 @@ def call_api(
     json_data: Optional[Dict] = None,
     files: Optional[List] = None,
     data: Optional[Dict] = None,
+    timeout: int = 10,
 ) -> Optional[requests.Response]:
     """Generic function to call an API endpoint."""
 
@@ -77,6 +78,7 @@ def call_api(
                 json=json_data,
                 files=files,
                 data=data,
+                timeout=timeout,
             )
 
             if response.status_code == 401:

{jvcli-2.0.28 → jvcli-2.0.30}/jvcli/client/pages/chat_page.py

@@ -21,9 +21,9 @@ def transcribe_audio(token: str, agent_id: str, file: bytes) -> dict:
 
     data = {
         "args": "{}",
-        "module_root": "actions.jivas.deepgram_stt_action",
+        "module_root": "jivas.agent.action",
         "agent_id": agent_id,
-        "walker": "transcribe_audio",
+        "walker": "invoke_stt_action",
     }
 
     headers = {"Authorization": f"Bearer {token}"}
@@ -35,7 +35,6 @@ def transcribe_audio(token: str, agent_id: str, file: bytes) -> dict:
 
     # Parse JSON response
     result = response.json()
-
     return result
 
 
@@ -47,29 +46,37 @@ def render(router: StreamlitRouter) -> None:
     st.header("Chat", divider=True)
     tts_on = st.toggle("TTS")
 
+    message = ""
+    # Handle audio input first
     audio_value = st.audio_input("Record a voice message")
-    if audio_value:
-        selected_agent = st.session_state.get("selected_agent")
-        result = transcribe_audio(ctx["token"], selected_agent, audio_value)
-        if result.get("success", False):
-            send_message(
-                result["transcript"], url, ctx["token"], selected_agent, tts_on
-            )
+    # Get selected agent from query params
+    selected_agent = st.query_params.get("agent")
 
-    if selected_agent := st.query_params.get("agent"):
+    if selected_agent:
         chat_messages = st.session_state.messages.get(selected_agent, [])
 
         # Display chat messages from history on app rerun
-        for message in chat_messages:
-            with st.chat_message(message["role"]):
-                st.markdown(message["content"])
-                if payload := message.get("payload"):
+        for item in chat_messages:
+            role = item.get("role", "user")
+            content = item.get("content", "")
+            with st.chat_message(role):
+                st.markdown(content)
+                if payload := item.get("payload"):
                     with st.expander("...", False):
                         st.json(payload)
 
-        # Accept user input
-        if prompt := st.chat_input("Type your message here"):
-            send_message(prompt, url, ctx["token"], selected_agent, tts_on)
+    # Process audio input if available
+    if audio_value and selected_agent:
+        result = transcribe_audio(ctx["token"], selected_agent, audio_value)
+        if result and result.get("success", False):
+            message = result["transcript"]
+
+    # Otherwise handle text input
+    if input := st.chat_input("Type your message here"):
+        message = input
+
+    if message:
+        send_message(message, url, ctx["token"], selected_agent, tts_on)
 
 
 def send_message(

{jvcli-2.0.28 → jvcli-2.0.30}/jvcli/commands/create.py

@@ -43,14 +43,6 @@ def create() -> None:
     default="No description provided.",
     help="Description of the action.",
 )
-@click.option(
-    "--type",
-    "--type",
-    default="action",
-    type=click.Choice(TYPE_SUFFIX_MAP.keys(), case_sensitive=False),
-    show_default=True,
-    help="Type of the action.",
-)
 @click.option(
     "--singleton",
     default=True,
@@ -58,6 +50,13 @@ def create() -> None:
     show_default=True,
     help="Indicate if the action is singleton.",
 )
+@click.option(
+    "--type",
+    default="action",
+    type=click.Choice(TYPE_SUFFIX_MAP.keys(), case_sensitive=False),
+    show_default=True,
+    help="Type of the action.",
+)
 @click.option(
     "--path",
     default="./actions",
@@ -69,19 +68,6 @@ def create() -> None:
     default=None,
     help="Namespace for the action. Defaults to the username in the token.",
 )
-@click.option(
-    "--singleton",
-    default=True,
-    type=bool,
-    show_default=True,
-    help="Indicate if the action is singleton.",
-)
-@click.option(
-    "--path",
-    default="./actions",
-    show_default=True,
-    help="Directory to create the action folder in.",
-)
 def create_action(
     name: str,
     version: str,
@@ -244,7 +230,7 @@ def render(router: StreamlitRouter, agent_id: str, action_id: str, info: dict) -
     \"\"\"
 
     # Add app header controls
-    (model_key, module_root) = app_header(agent_id, action_id, info)
+    (model_key, action) = app_header(agent_id, action_id, info)
 
     # Add app main controls
     app_controls(agent_id, action_id)

{jvcli-2.0.28 → jvcli-2.0.30}/jvcli/commands/server.py

@@ -101,23 +101,49 @@ def createadmin(email: Optional[str] = None, password: Optional[str] = None) ->
     if password is None:
         password = click.prompt("Password", hide_input=True)
 
-    signup_url = (
-        f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/register"
-    )
-
-    click.echo("Creating system admin...")
+    database_host = os.environ.get("DATABASE_HOST")
 
-    try:
-        response = requests.post(
-            signup_url, json={"email": email, "password": password}
+    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"
         )
-        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)
+
+        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()

{jvcli-2.0.28 → jvcli-2.0.30/jvcli.egg-info}/PKG-INFO

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

{jvcli-2.0.28 → jvcli-2.0.30}/tests/test_server.py

@@ -595,6 +595,47 @@ class TestCreateAdminCommand:
             },
         )
 
+    def test_createadmin_using_jac_command(self, mocker: MockerFixture) -> None:
+        """Test creating admin user using the jac command."""
+        # Mock subprocess.call successful return
+        mock_subprocess = mocker.patch(
+            "jvcli.commands.server.subprocess.call", return_value=0
+        )
+
+        # Environment with DATABASE_HOST
+        mocker.patch.dict(
+            os.environ,
+            {
+                "DATABASE_HOST": "postgres:5432",
+                "JIVAS_BASE_URL": "http://localhost:8000",
+            },
+        )
+
+        # Run command
+        runner = CliRunner()
+        result = runner.invoke(
+            server,
+            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
+        )
+
+        # Verify behavior
+        assert result.exit_code == 0
+        assert "Creating system admin..." in result.output
+        assert "Admin user created successfully!" in result.output
+
+        # Verify jac command was called
+        mock_subprocess.assert_called_once_with(
+            [
+                "jac",
+                "create_system_admin",
+                "main.jac",
+                "--email",
+                "admin@example.com",
+                "--password",
+                "admin123",
+            ]
+        )
+
     def test_failed_signup_endpoint(self, mocker: MockerFixture) -> None:
         """Test behavior when signup endpoint returns an error."""
         # Mock API error response
@@ -619,6 +660,25 @@ class TestCreateAdminCommand:
         assert result.exit_code == 0
         assert "Failed to create admin: Email already exists" in result.output
 
+    def test_failed_jac_command(self, mocker: MockerFixture) -> None:
+        """Test behavior when jac command fails."""
+        # Mock subprocess.call failure
+        mocker.patch("jvcli.commands.server.subprocess.call", return_value=1)
+
+        # Environment with DATABASE_HOST
+        mocker.patch.dict(os.environ, {"DATABASE_HOST": "postgres:5432"})
+
+        # Run command
+        runner = CliRunner()
+        result = runner.invoke(
+            server,
+            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
+        )
+
+        # Verify behavior
+        assert result.exit_code == 0
+        assert "Failed to create admin user" in result.output
+
     def test_createadmin_with_prompts(self, mocker: MockerFixture) -> None:
         """Test creating admin with interactive prompts for credentials."""
         # Mock prompts
@@ -678,3 +738,25 @@ class TestCreateAdminCommand:
         # Verify behavior
         assert result.exit_code == 0
         assert "Error connecting to Jivas Server: Connection refused" in result.output
+
+    def test_createadmin_jac_command_exception(self, mocker: MockerFixture) -> None:
+        """Test behavior when jac command raises an exception."""
+        # Mock subprocess to raise an exception
+        mocker.patch(
+            "jvcli.commands.server.subprocess.call",
+            side_effect=Exception("Command not found"),
+        )
+
+        # Environment with DATABASE_HOST
+        mocker.patch.dict(os.environ, {"DATABASE_HOST": "postgres:5432"})
+
+        # Run command
+        runner = CliRunner()
+        result = runner.invoke(
+            server,
+            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
+        )
+
+        # Verify behavior
+        assert result.exit_code == 0
+        assert "Error running jac command: Command not found" in result.output