PyPI - hyperforge - Versions diffs - 1.0.0.post56__tar.gz → 1.0.0.post60__tar.gz - Mend

hyperforge 1.0.0.post56tar.gz → 1.0.0.post60tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (106) hide show

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge
-Version: 1.0.0.post56
+Version: 1.0.0.post60
 Summary: Agentic Framework for Orchestrated Runtime, Governance, and Execution
 Author: AI Data Team
 Author-email: AI Data Team <learning@nuclia.com>

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 [project]
 name = "hyperforge"
-version = "1.0.0.post56"
+version = "1.0.0.post60"
 authors = [{ name = "AI Data Team", email = "learning@nuclia.com" }]
 description = "Agentic Framework for Orchestrated Runtime, Governance, and Execution"
 readme = "README.md"

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/api/v1/mcp_content.py RENAMED Viewed

@@ -229,6 +229,19 @@ def convert_arag_answer_to_content(
                 )
             )
+        if context.json_objects:
+            for idx, json_obj in enumerate(context.json_objects):
+                contents.append(
+                    EmbeddedResource(
+                        type="resource",
+                        resource=TextResourceContents(
+                            uri=f"rao-response://context/{context.id}/json-objects/{idx}",  # type: ignore[arg-type]
+                            text=json.dumps(pydantic_core.to_jsonable_python(json_obj)),
+                            mimeType="application/json",
+                        ),
+                    )
+                )
         if context.image_urls:
             contents.append(
                 EmbeddedResource(
@@ -272,6 +285,7 @@ def convert_arag_answer_to_content(
                 type="text",
                 text="\n".join(parts),
                 annotations=Annotations(audience=["assistant"]),
+                _meta=step.metadata,
             )
         )

hyperforge-1.0.0.post60/src/hyperforge/api/v1/oauth.py ADDED Viewed

@@ -0,0 +1,163 @@
+import logging
+from urllib.parse import urlencode
+from cryptography.fernet import InvalidToken
+from fastapi import Query
+from starlette.requests import Request
+from starlette.responses import HTMLResponse
+from hyperforge.api.settings import Settings
+from hyperforge.api.v1.router import router
+from hyperforge.api.v1.utils import tracer
+from hyperforge_mcp.http import _fingerprint, decrypt_mcp_oauth_state
+logger = logging.getLogger(__name__)
+RENDER = "<html><body><h1>OAuth Completed</h1><p>You can close this window and return to the application.</p></body></html>"
+def _build_oauth_subject(
+    settings: Settings,
+    account_id: str,
+    agent_id: str,
+    workflow_id: str,
+    session: str,
+    question_id: str,
+    oauth_uuid: str,
+) -> str:
+    return settings.oauth_subject.format(
+        account=account_id,
+        agent_id=agent_id,
+        session=session,
+        question=question_id,
+        oauth_uuid=oauth_uuid,
+        workflow_id=workflow_id,
+    )
+@router.get(
+    "/api/auth/agent/{agent_id}/workflow/{workflow_id}/session/{session}/oauth/{oauth_uuid}/callback",
+    status_code=200,
+    description="Get Agent Schema",
+    tags=["Retrieval Agent"],
+    include_in_schema=False,
+)
+async def oauth_callback(
+    request: Request,
+    agent_id: str,
+    session: str,
+    workflow_id: str,
+    oauth_uuid: str,
+    question_id: str = Query(..., include_in_schema=False),
+    state: str = Query(..., include_in_schema=False),
+    account_id: str = Query(..., include_in_schema=False),
+):
+    """
+    Callback from oauth flow on RAO that requires to send creds to websocket
+    """
+    settings: Settings = request.app.settings
+    subject = _build_oauth_subject(
+        settings,
+        account_id,
+        agent_id,
+        workflow_id,
+        session,
+        question_id,
+        oauth_uuid,
+    )
+    # Request a question
+    with tracer().start_as_current_span("Request activation"):
+        logger.info(
+            "OAuth callback received for agent=%s, session=%s, oauth_uuid=%s, question_id=%s",
+            agent_id,
+            session,
+            oauth_uuid,
+            question_id,
+        )
+        await request.app.broker.send_reply(subject, state)
+        logger.info(
+            "OAuth callback published to stream %s",
+            subject,
+        )
+    return HTMLResponse(content=RENDER)
+@router.get(
+    "/api/auth/mcp/callback",
+    status_code=200,
+    description="Generic MCP OAuth callback (fixed redirect URI, state-routed)",
+    tags=["Retrieval Agent"],
+    include_in_schema=False,
+)
+async def mcp_oauth_callback_generic(
+    request: Request,
+    code: str | None = Query(None, include_in_schema=False),
+    state: str | None = Query(None, include_in_schema=False),
+    error: str | None = Query(None, include_in_schema=False),
+    error_description: str | None = Query(None, include_in_schema=False),
+):
+    settings: Settings = request.app.settings
+    if state is None:
+        logger.warning("MCP generic OAuth callback received without state parameter")
+        return HTMLResponse(content="Missing OAuth state parameter", status_code=400)
+    try:
+        routing = decrypt_mcp_oauth_state(state)
+    except InvalidToken:
+        logger.warning(
+            "MCP generic OAuth callback: invalid or expired state (Fernet decryption failed)"
+        )
+        return HTMLResponse(content="Invalid or expired OAuth state", status_code=400)
+    sdk_state = routing.sdk_state or None
+    if sdk_state is None:
+        logger.warning(
+            "MCP generic OAuth callback: decrypted state missing sdk_state field"
+        )
+        return HTMLResponse(content="Malformed OAuth state", status_code=400)
+    subject = _build_oauth_subject(
+        settings,
+        routing.account_id,
+        routing.agent_id,
+        routing.workflow_id,
+        routing.session_id,
+        routing.question_id,
+        routing.oauth_uuid,
+    )
+    payload_data: dict[str, str] = {}
+    if code is not None:
+        payload_data["code"] = code
+    if sdk_state is not None:
+        payload_data["state"] = sdk_state
+    if error is not None:
+        payload_data["error"] = error
+    if error_description is not None:
+        payload_data["error_description"] = error_description
+    payload = urlencode(payload_data)
+    with tracer().start_as_current_span("MCP generic OAuth callback"):
+        logger.info(
+            "MCP generic OAuth callback: agent=%s workflow=%s session=%s question_id=%s oauth_uuid=%s sdk_state_fp=%s has_code=%s has_error=%s",
+            routing.agent_id,
+            routing.workflow_id,
+            routing.session_id,
+            routing.question_id,
+            routing.oauth_uuid,
+            _fingerprint(sdk_state),
+            code is not None,
+            error is not None,
+        )
+        await request.app.broker.send_reply(subject, payload)
+        logger.info("mcp_oauth send_reply: published to stream %s", subject)
+    if error is not None:
+        desc = f": {error_description}" if error_description else ""
+        return HTMLResponse(
+            content=f"OAuth authorization failed ({error}{desc})", status_code=400
+        )
+    return HTMLResponse(content=RENDER)

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/interaction.py RENAMED Viewed

@@ -60,6 +60,7 @@ class Provider(Enum):
     AZURE_CERTIFICATE_CREDENTIALS = "azure_certificate_credentials"
     AWS_S3_ACCESS_KEYS = "aws_s3_access_keys"
     SHAREFILE_OAUTH = "sharefile_oauth"
+    MCP_OAUTH = "mcp_oauth"
 class OAuthAuthenticateURL(BaseModel):

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/memory/memory.py RENAMED Viewed

@@ -85,6 +85,7 @@ class BaseSessionMemory:
     agent_id: str = ""
     workflow_id: str = ""
+    account_id: str = ""
     kbid: Optional[str] = None
     # User information dictionary
@@ -638,6 +639,10 @@ class QuestionMemory:
         """Returns the workflow ID for the current question. The workflow ID is a unique identifier that is shared across all questions and interactions that belong to the same workflow. This can be used to group related interactions together, and to keep track of the conversation history in a coherent way."""
         return self.session.workflow_id
+    def get_account_id(self) -> str:
+        """Returns the account ID for the current question."""
+        return self.session.account_id
     def context_user_info(self) -> str:
         """Returns a string with user information that can be used in the context of the agent. This can include information such as user preferences, user history, or any other relevant information about the user that can help the agent to generate a more personalized and accurate response."""
         return self.session.context_user_info()

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/models.py RENAMED Viewed

@@ -122,6 +122,7 @@ class Step(BaseModel):
     input_nuclia_tokens: Optional[float]
     output_nuclia_tokens: Optional[float]
     error: Optional[str] = None
+    metadata: Optional[Dict[str, Any]] = None
     def __str__(self):
         return f"({self.timeit:.2f}s) {self.module}: {self.title} \n {self.value} \n {self.reason} \n NT:({self.input_nuclia_tokens}:{self.output_nuclia_tokens})"
@@ -248,6 +249,25 @@ CONTEXT_TEMPLATE = """
 CONTEXT_PROMPT_TEMPLATE = PROMPT_ENVIRONMENT.from_string(CONTEXT_TEMPLATE)
+class JSONObject(BaseModel):
+    json_schema: Optional[Dict[str, Any]] = Field(
+        default=None,
+        description="JSON schema that defines the structure of the JSON object.",
+    )
+    json_object: Dict[str, Any] = Field(
+        default_factory=dict,
+        description="The actual JSON object that conforms to the provided JSON schema.",
+    )
+    metadata: Optional[Dict[str, Any]] = Field(
+        default_factory=dict,
+        description="Optional metadata associated with the JSON object.",
+    )
+    id: Optional[str] = Field(
+        default_factory=lambda: uuid.uuid4().hex,
+        description="Unique identifier for this JSON object instance.",
+    )
 class Context(BaseModel):
     id: str = Field(
         default_factory=lambda: uuid.uuid4().hex,
@@ -260,6 +280,7 @@ class Context(BaseModel):
     images: Dict[str, Image] = Field(default_factory=dict)
     prompts: List[Prompt] = Field(default_factory=list)
     structured: List[str] = Field(default_factory=list)
+    json_objects: List[JSONObject] = Field(default_factory=list)
     source: str
     agent: str
     # XXX: This is not actually a summary, but an answer attempt for now!

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/server/session.py RENAMED Viewed

@@ -181,8 +181,12 @@ class SessionManager:
                     config=config.memory,
                     agent=message.agent_id,
                     workflow_id=message.workflow_id,
+                    account_id=message.account,
                 )
-                self.memory[message.session] = memory
+                # Ephemeral sessions are short-lived and should not be persisted in
+                # the shared LRU cache across activations.
+                if message.session != "ephemeral":
+                    self.memory[message.session] = memory
             else:
                 memory = self.memory[message.session]

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/server/utils.py RENAMED Viewed

@@ -16,6 +16,7 @@ async def get_memory(
     config: MemoryConfig,
     agent: str,
     workflow_id: str,
+    account_id: str = "",
 ) -> BaseSessionMemory:
     memory: BaseSessionMemory
@@ -53,5 +54,6 @@ async def get_memory(
         )
     memory.init(session=session)
+    memory.account_id = account_id
     return memory

{hyperforge-1.0.0.post56 → hyperforge-1.0.0.post60}/src/hyperforge/settings.py RENAMED Viewed

@@ -2,17 +2,23 @@ from pydantic import model_validator
 from pydantic_settings import BaseSettings
 _REDIRECT_PATH = "/api/auth/agent/{agent_id}/workflow/{workflow_id}/session/{session_id}/oauth/{oauth_uuid}/callback"
+_MCP_CALLBACK_PATH = "/api/auth/mcp/callback"
 class OAuthSettings(BaseSettings):
     nuclia_public_url: str = "https://{zone}.nuclia.com"
     nuclia_zone: str = "arag"
     rao_redirect_url: str = ""
+    mcp_callback_url: str = ""
     @model_validator(mode="after")
     def _resolve_urls(self) -> "OAuthSettings":
         self.nuclia_public_url = self.nuclia_public_url.format(zone=self.nuclia_zone)
         if not self.rao_redirect_url:
             self.rao_redirect_url = self.nuclia_public_url.rstrip("/") + _REDIRECT_PATH
+        if not self.mcp_callback_url:
+            self.mcp_callback_url = (
+                self.nuclia_public_url.rstrip("/") + _MCP_CALLBACK_PATH
+            )
         return self

hyperforge-1.0.0.post56/src/hyperforge/api/v1/oauth.py DELETED Viewed

@@ -1,60 +0,0 @@
-import logging
-from fastapi import Query
-from starlette.requests import Request
-from starlette.responses import HTMLResponse
-from hyperforge.api.settings import Settings
-from hyperforge.api.v1.router import router
-from hyperforge.api.v1.utils import tracer
-logger = logging.getLogger(__name__)
-RENDER = "<html><body><h1>OAuth Completed</h1><p>You can close this window and return to the application.</p></body></html>"
-@router.get(
-    "/api/auth/agent/{agent_id}/workflow/{workflow_id}/session/{session}/oauth/{oauth_uuid}/callback",
-    status_code=200,
-    description="Get Agent Schema",
-    tags=["Retrieval Agent"],
-    include_in_schema=False,
-)
-async def oauth_callback(
-    request: Request,
-    agent_id: str,
-    session: str,
-    workflow_id: str,
-    oauth_uuid: str,
-    question_id: str = Query(..., include_in_schema=False),
-    state: str = Query(..., include_in_schema=False),
-    account_id: str = Query(..., include_in_schema=False),
-):
-    """
-    Callback from oauth flow on RAO that requires to send creds to websocket
-    """
-    settings: Settings = request.app.settings
-    subject = settings.oauth_subject.format(
-        account=account_id,
-        agent_id=agent_id,
-        session=session,
-        question=question_id,
-        oauth_uuid=oauth_uuid,
-        workflow_id=workflow_id,
-    )
-    # Request a question
-    with tracer().start_as_current_span("Request activation"):
-        logger.info(
-            "OAuth callback received for agent=%s, session=%s, oauth_uuid=%s, question_id=%s",
-            agent_id,
-            session,
-            oauth_uuid,
-            question_id,
-        )
-        await request.app.broker.send_reply(subject, state)
-        logger.info(
-            "OAuth callback published to stream %s",
-            subject,
-        )
-    return HTMLResponse(content=RENDER)