jvserve 2.0.9__py3-none-any.whl → 2.0.10__py3-none-any.whl

jvserve/__init__.py

@@ -4,5 +4,5 @@ jvserve package initialization.
 This package provides the webserver for loading and interacting with JIVAS agents.
 """
 
-__version__ = "2.0.9"
+__version__ = "2.0.10"
 __supported__jivas__versions__ = ["2.0.0"]

jvserve/lib/agent_interface.py

@@ -6,13 +6,14 @@ import os
 import string
 import time
 import traceback
-from typing import Any, Dict, List, Optional
+from asyncio import sleep
+from typing import Any, AsyncGenerator, Dict, Iterator, List, Optional
 from urllib.parse import quote, unquote
 
 import aiohttp
 import requests
 from fastapi import File, Form, Request, UploadFile
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, StreamingResponse
 from jac_cloud.core.architype import AnchorState, Permission, Root
 from jac_cloud.core.context import (
     JASECI_CONTEXT,
@@ -244,7 +245,6 @@ class AgentInterface:
     @staticmethod
     def interact(payload: InteractPayload) -> dict:
         """Interact with the agent."""
-
         response = None
         ctx = AgentInterface.load_context()
         session_id = payload.session_id if payload.session_id else ""
@@ -274,15 +274,103 @@ class AgentInterface:
                     },
                     module_name="jivas.agent.action.interact",
                 ),
-            ).response
+            )
+
+            if payload.streaming:
+                # since streaming occurs asynchronously, we'll need to close the context for writebacks here
+                # at this point of closure, there will be an open interaction_node without a response
+                # our job hereafter is to stream to completion and then update and close this interaction_node with the final result
+
+                ctx.close()
+                if (
+                    response is not None
+                    and hasattr(response, "generator")
+                    and hasattr(response, "interaction_node")
+                ):
+
+                    interaction_node = response.interaction_node
+
+                    async def generate(
+                        generator: Iterator,
+                    ) -> AsyncGenerator[str, None]:
+                        """
+                        Asynchronously yield data chunks from a response generator in Server-Sent Events (SSE) format.
+
+                        Accumulates the full text content and yields each chunk as a JSON-encoded SSE message.
+                        After all chunks are processed, updates the interaction node with the complete generated text and triggers an update in the graph context.
+
+                        Yields:
+                            str: A JSON-encoded string representing the current chunk of data in SSE format.
+                        """
+                        full_text = ""
+                        total_tokens = 0
+                        try:
+                            for chunk in generator:
+                                full_text += chunk.content
+                                total_tokens += 1  # each chunk is a token, let's tally
+                                await sleep(0.025)
+                                yield (
+                                    "data: "
+                                    + json.dumps(
+                                        {
+                                            "id": interaction_node.id,
+                                            "content": chunk.content,
+                                            "session_id": interaction_node.response.get(
+                                                "session_id"
+                                            ),
+                                            "type": chunk.type,
+                                            "metadata": chunk.response_metadata,
+                                        }
+                                    )
+                                    + "\n\n"
+                                )
+                            # Update the interaction node with the fully generated text
+                            actx = await AgentInterface.load_context_async()
+                            try:
+                                interaction_node.set_text_message(message=full_text)
+                                interaction_node.add_tokens(total_tokens)
+                                _Jac.spawn_call(
+                                    NodeAnchor.ref(interaction_node.id).architype,
+                                    AgentInterface.spawn_walker(
+                                        walker_name="update_interaction",
+                                        attributes={
+                                            "interaction_data": interaction_node.export(),
+                                        },
+                                        module_name="jivas.agent.action.update_interaction",
+                                    ),
+                                )
+                            finally:
+                                if actx:
+                                    actx.close()
+
+                        except Exception as e:
+                            AgentInterface.LOGGER.error(
+                                f"Exception in streaming generator: {e}, {traceback.format_exc()}"
+                            )
+
+                    return StreamingResponse(
+                        generate(response.generator),
+                        media_type="text/event-stream",
+                    )
+
+                else:
+                    AgentInterface.LOGGER.error(
+                        "Response is None or missing required attributes for streaming."
+                    )
+                    return {}
+
+            else:
+                response = response.response
+                ctx.close()
+                return response if response else {}
+
         except Exception as e:
             AgentInterface.EXPIRATION = None
             AgentInterface.LOGGER.error(
                 f"an exception occurred: {e}, {traceback.format_exc()}"
             )
-
-        ctx.close()
-        return response if response else {}
+            ctx.close()
+            return {}
 
     @staticmethod
     def pulse(action_label: str, agent_id: str = "") -> dict:

{jvserve-2.0.9.dist-info → jvserve-2.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvserve
-Version: 2.0.9
+Version: 2.0.10
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.

jvserve-2.0.10.dist-info/RECORD

@@ -0,0 +1,13 @@
+jvserve/__init__.py,sha256=G5RMqYLR93brkiHRY7SgXqOtzchdd-v6TicDAX7ec6I,191
+jvserve/cli.py,sha256=ltg-n-ZFsvitAGIhxY8xgwPI2CETLanZ_0bqrvsqqg8,4994
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=vGJQ9A_9kWfa6YoW7BiidZO6Huf-0XSlunMLMNGqgws,31053
+jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
+jvserve/lib/file_interface.py,sha256=ccnMw5k1NtfK5ylNcvlCJE-Ene3tZigh6Q1gHRy7Sow,6026
+jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
+jvserve-2.0.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.0.10.dist-info/METADATA,sha256=7Ptq6E2I9CPquslz_lrKi7rFAzqRIY2Qso6zmhbE1PM,4791
+jvserve-2.0.10.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+jvserve-2.0.10.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.0.10.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.0.10.dist-info/RECORD,,

jvserve-2.0.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-jvserve/__init__.py,sha256=nxazVqbIeC0Orvk372cl5arEJiKYDj0AmAecgNpgAXQ,190
-jvserve/cli.py,sha256=ltg-n-ZFsvitAGIhxY8xgwPI2CETLanZ_0bqrvsqqg8,4994
-jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
-jvserve/lib/agent_interface.py,sha256=zPaF8Yz3V36BJ5BulqwYwBSiToVligVXoKk8R0x8xRQ,26552
-jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
-jvserve/lib/file_interface.py,sha256=ccnMw5k1NtfK5ylNcvlCJE-Ene3tZigh6Q1gHRy7Sow,6026
-jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
-jvserve-2.0.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.0.9.dist-info/METADATA,sha256=yhKfhNnOZJGO1zJGQ7Q5sE7vQDXPXIYvC_cApjRPuoQ,4790
-jvserve-2.0.9.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-jvserve-2.0.9.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.0.9.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.0.9.dist-info/RECORD,,