Merge branch 'main' into feat/memory-service-scaffold

Author: mjnovice

.github/workflows/publish-docs.yml

@@ -9,6 +9,10 @@ on:
       - "packages/uipath/docs/**"
       - "packages/uipath/mkdocs.yml"
       - "packages/uipath/pyproject.toml"
+      - "packages/uipath-platform/src/**"
+      - "packages/uipath-platform/pyproject.toml"
+      - "packages/uipath-core/src/**"
+      - "packages/uipath-core/pyproject.toml"
   repository_dispatch:
     types: [publish-docs]
 

packages/uipath-core/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath-core"
-version = "0.5.10"
+version = "0.5.11"
 description = "UiPath Core abstractions"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

packages/uipath-core/src/uipath/core/guardrails/guardrails.py

@@ -227,7 +227,7 @@ class BaseGuardrail(BaseModel):
     name: str
     description: str | None = None
     enabled_for_evals: bool = Field(True, alias="enabledForEvals")
-    selector: GuardrailSelector
+    selector: GuardrailSelector | None = None
 
     model_config = ConfigDict(populate_by_name=True, extra="allow")
 

packages/uipath-core/uv.lock

@@ -1,6 +1,6 @@
 [project]
 name = "uipath-platform"
-version = "0.1.16"
+version = "0.1.31"
 description = "HTTP client library for programmatic access to UiPath Platform"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

packages/uipath-platform/pyproject.toml

@@ -144,7 +144,9 @@ def llm(self) -> UiPathLlmChatService:
 
     @property
     def entities(self) -> EntitiesService:
-        return EntitiesService(self._config, self._execution_context)
+        return EntitiesService(
+            self._config, self._execution_context, folders_service=self.folders
+        )
 
     @cached_property
     def resource_catalog(self) -> ResourceCatalogService:

packages/uipath-platform/src/uipath/platform/_uipath.py

@@ -7,6 +7,7 @@
 from ._base_service import BaseService
 from ._bindings import (
     ConnectionResourceOverwrite,
+    EntityResourceOverwrite,
     GenericResourceOverwrite,
     ResourceOverwrite,
     ResourceOverwriteParser,
@@ -100,6 +101,7 @@
     "EndpointManager",
     "jsonschema_to_pydantic",
     "ConnectionResourceOverwrite",
+    "EntityResourceOverwrite",
     "GenericResourceOverwrite",
     "ResourceOverwrite",
     "ResourceOverwriteParser",

packages/uipath-platform/src/uipath/platform/common/__init__.py

@@ -11,6 +11,8 @@
     HTTPStatusError,
     Response,
 )
+from opentelemetry import trace
+from opentelemetry.trace import format_span_id, format_trace_id
 from tenacity import (
     retry,
     retry_if_exception,
@@ -61,6 +63,38 @@ def _get_caller_component() -> str:
     return ""
 
 
+_TRACE_PARENT_HEADER = "x-uipath-traceparent-id"
+
+
+def _inject_trace_context(headers: dict[str, str]) -> None:
+    """Inject UiPath trace context header.
+
+    Trace ID: uses the agent trace ID from UIPATH_TRACE_ID env var (same
+    remapping the LLMOps exporter applies), falling back to the OTEL trace ID.
+    Span ID: uses the LLMOps tool span (via external span provider) so the
+    span ID matches what's visible in the LLMOps trace UI.
+    """
+    from uipath.core.tracing.span_utils import UiPathSpanUtils
+
+    from ._config import UiPathConfig
+    from ._span_utils import _SpanUtils
+
+    llmops_span = UiPathSpanUtils.get_external_current_span()
+    span = llmops_span or trace.get_current_span()
+    ctx = span.get_span_context()
+    if not (ctx.trace_id and ctx.span_id):
+        return
+
+    config_trace_id = UiPathConfig.trace_id
+    trace_id = (
+        _SpanUtils.normalize_trace_id(config_trace_id)
+        if config_trace_id
+        else format_trace_id(ctx.trace_id)
+    )
+    span_id = format_span_id(ctx.span_id)
+    headers[_TRACE_PARENT_HEADER] = f"00-{trace_id}-{span_id}-01"
+
+
 class BaseService:
     def __init__(
         self, config: UiPathApiConfig, execution_context: UiPathExecutionContext
@@ -106,6 +140,7 @@ def request(
 
         kwargs.setdefault("headers", {})
         kwargs["headers"][HEADER_USER_AGENT] = user_agent_value(specific_component)
+        _inject_trace_context(kwargs["headers"])
 
         override = resolve_service_url(str(url))
         if override:
@@ -150,6 +185,7 @@ async def request_async(
         kwargs["headers"][HEADER_USER_AGENT] = user_agent_value(
             self._specific_component
         )
+        _inject_trace_context(kwargs["headers"])
 
         override = resolve_service_url(str(url))
         if override:

packages/uipath-platform/src/uipath/platform/common/_base_service.py

@@ -14,7 +14,14 @@
     Union,
 )
 
-from pydantic import AliasChoices, BaseModel, ConfigDict, Field, TypeAdapter
+from pydantic import (
+    AliasChoices,
+    BaseModel,
+    ConfigDict,
+    Field,
+    TypeAdapter,
+    model_validator,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -59,6 +66,29 @@ def folder_identifier(self) -> str:
         return self.folder_path
 
 
+class EntityResourceOverwrite(ResourceOverwrite):
+    resource_type: Literal["entity"]
+    name: str = Field(alias="name")
+    folder_id: Optional[str] = Field(default=None, alias="folderId")
+    folder_path: Optional[str] = Field(default=None, alias="folderPath")
+
+    @model_validator(mode="after")
+    def validate_folder_identifier(self) -> "EntityResourceOverwrite":
+        if self.folder_id and self.folder_path:
+            raise ValueError("Only one of folderId or folderPath may be provided.")
+        if not self.folder_id and not self.folder_path:
+            raise ValueError("Either folderId or folderPath must be provided.")
+        return self
+
+    @property
+    def resource_identifier(self) -> str:
+        return self.name
+
+    @property
+    def folder_identifier(self) -> str:
+        return self.folder_id or self.folder_path or ""
+
+
 class ConnectionResourceOverwrite(ResourceOverwrite):
     resource_type: Literal["connection"]
     # In eval context, studio web provides "ConnectionId".
@@ -83,7 +113,9 @@ def folder_identifier(self) -> str:
 
 
 ResourceOverwriteUnion = Annotated[
-    Union[GenericResourceOverwrite, ConnectionResourceOverwrite],
+    Union[
+        GenericResourceOverwrite, EntityResourceOverwrite, ConnectionResourceOverwrite
+    ],
     Field(discriminator="resource_type"),
 ]
 
@@ -112,9 +144,23 @@ def parse(cls, key: str, value: dict[str, Any]) -> ResourceOverwrite:
             The appropriate ResourceOverwrite subclass instance
         """
         resource_type = key.split(".")[0]
-        value_with_type = {"resource_type": resource_type, **value}
+        normalized_value = cls._normalize_value(resource_type, value)
+        value_with_type = {"resource_type": resource_type, **normalized_value}
         return cls._adapter.validate_python(value_with_type)
 
+    @staticmethod
+    def _normalize_value(resource_type: str, value: dict[str, Any]) -> dict[str, Any]:
+        if resource_type != "entity":
+            return value
+
+        normalized = dict(value)
+        if "folderId" in normalized:
+            normalized["folder_id"] = normalized.pop("folderId")
+        if "folderPath" in normalized:
+            normalized["folder_path"] = normalized.pop("folderPath")
+
+        return normalized
+
 
 _resource_overwrites: ContextVar[Optional[dict[str, ResourceOverwrite]]] = ContextVar(
     "resource_overwrites", default=None