Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "sap-cloud-sdk"
version = "0.49.1"
version = "0.51.0"
description = "SAP Cloud SDK for Python"
readme = "README.md"
license = "Apache-2.0"
Expand Down
27 changes: 18 additions & 9 deletions src/sap_cloud_sdk/agent_memory/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@

from typing import Optional

from sap_cloud_sdk.agent_memory._http_transport import HttpTransport
from sap_cloud_sdk.agent_memory.client import AgentMemoryClient
from sap_cloud_sdk.agent_memory.config import (
AgentMemoryConfig,
_load_config_for_instance,
_load_config_from_env,
_make_config_factory,
)
from sap_cloud_sdk.agent_memory.exceptions import (
AgentMemoryConfigError,
Expand All @@ -40,6 +38,19 @@
SearchResult,
)
from sap_cloud_sdk.agent_memory.utils._odata import FilterDefinition
from sap_cloud_sdk.core._http_client import HttpClient, XsuaaAuthProvider


def _build_agent_memory_http(
instance: str, config: Optional[AgentMemoryConfig]
) -> HttpClient:
if config is not None:
auth = XsuaaAuthProvider(lambda: config) if config.token_url else None
return HttpClient(config.base_url, auth, timeout=config.timeout)
factory = _make_config_factory(instance)
cfg = factory()
auth = XsuaaAuthProvider(factory) if cfg.token_url else None
return HttpClient(cfg.base_url, auth, timeout=cfg.timeout)


def create_client(
Expand Down Expand Up @@ -78,15 +89,13 @@ def create_client(
"""
try:
if config is not None:
resolved_config = config
http = _build_agent_memory_http("default", config)
elif access_strategy is AccessStrategy.SUBSCRIBER and tenant:
resolved_config = _load_config_for_instance(tenant)
http = _build_agent_memory_http(tenant, None)
else:
resolved_config = _load_config_from_env()

transport = HttpTransport(resolved_config)
http = _build_agent_memory_http("default", None)
return AgentMemoryClient(
transport,
http,
access_strategy=access_strategy,
tenant=tenant,
)
Expand Down
267 changes: 0 additions & 267 deletions src/sap_cloud_sdk/agent_memory/_http_transport.py

This file was deleted.

Loading
Loading