phenoml 0.0.2__py3-none-any.whl → 0.0.15__py3-none-any.whl

phenoml/tools/client.py

@@ -6,13 +6,9 @@ from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from .mcp_server.client import AsyncMcpServerClient, McpServerClient
 from .raw_client import AsyncRawToolsClient, RawToolsClient
-from .types.cohort_request_provider import CohortRequestProvider
 from .types.cohort_response import CohortResponse
-from .types.fhir_client_config import FhirClientConfig
-from .types.lang2fhir_and_create_request_provider import Lang2FhirAndCreateRequestProvider
 from .types.lang2fhir_and_create_request_resource import Lang2FhirAndCreateRequestResource
 from .types.lang2fhir_and_create_response import Lang2FhirAndCreateResponse
-from .types.lang2fhir_and_search_request_provider import Lang2FhirAndSearchRequestProvider
 from .types.lang2fhir_and_search_response import Lang2FhirAndSearchResponse
 
 # this is used as the default value for optional parameters
@@ -40,8 +36,9 @@ class ToolsClient:
         *,
         resource: Lang2FhirAndCreateRequestResource,
         text: str,
-        provider: typing.Optional[Lang2FhirAndCreateRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Lang2FhirAndCreateResponse:
         """
@@ -55,10 +52,16 @@ class ToolsClient:
         text : str
             Natural language text to convert to FHIR resource
 
-        provider : typing.Optional[Lang2FhirAndCreateRequestProvider]
-            FHIR provider to use for storing the resource
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -76,12 +79,19 @@ class ToolsClient:
             token="YOUR_TOKEN",
         )
         client.tools.create_fhir_resource(
+            phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+            phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
             resource="auto",
             text="Patient John Doe has severe asthma with acute exacerbation",
         )
         """
         _response = self._raw_client.create_fhir_resource(
-            resource=resource, text=text, provider=provider, meta=meta, request_options=request_options
+            resource=resource,
+            text=text,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
+            provider=provider,
+            request_options=request_options,
         )
         return _response.data
 
@@ -89,11 +99,12 @@ class ToolsClient:
         self,
         *,
         text: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         patient_id: typing.Optional[str] = OMIT,
         practitioner_id: typing.Optional[str] = OMIT,
         count: typing.Optional[int] = OMIT,
-        provider: typing.Optional[Lang2FhirAndSearchRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Lang2FhirAndSearchResponse:
         """
@@ -104,6 +115,14 @@ class ToolsClient:
         text : str
             Natural language text to convert to FHIR search parameters
 
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
+
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
         patient_id : typing.Optional[str]
             Patient ID to filter results
 
@@ -113,10 +132,8 @@ class ToolsClient:
         count : typing.Optional[int]
             Maximum number of results to return
 
-        provider : typing.Optional[Lang2FhirAndSearchRequestProvider]
-            FHIR provider to use for searching
-
-        meta : typing.Optional[FhirClientConfig]
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -134,16 +151,19 @@ class ToolsClient:
             token="YOUR_TOKEN",
         )
         client.tools.search_fhir_resources(
+            phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+            phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
             text="Find all appointments for patient John Doe next week",
         )
         """
         _response = self._raw_client.search_fhir_resources(
             text=text,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
             patient_id=patient_id,
             practitioner_id=practitioner_id,
             count=count,
             provider=provider,
-            meta=meta,
             request_options=request_options,
         )
         return _response.data
@@ -152,8 +172,9 @@ class ToolsClient:
         self,
         *,
         text: str,
-        provider: CohortRequestProvider,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CohortResponse:
         """
@@ -164,10 +185,16 @@ class ToolsClient:
         text : str
             Natural language text describing the patient cohort criteria
 
-        provider : CohortRequestProvider
-            FHIR provider to use for searching
+        provider : str
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
+
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -185,12 +212,18 @@ class ToolsClient:
             token="YOUR_TOKEN",
         )
         client.tools.analyze_cohort(
+            phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+            phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
             text="female patients over 20 with diabetes but not hypertension",
-            provider="medplum",
+            provider="550e8400-e29b-41d4-a716-446655440000",
         )
         """
         _response = self._raw_client.analyze_cohort(
-            text=text, provider=provider, meta=meta, request_options=request_options
+            text=text,
+            provider=provider,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
+            request_options=request_options,
         )
         return _response.data
 
@@ -216,8 +249,9 @@ class AsyncToolsClient:
         *,
         resource: Lang2FhirAndCreateRequestResource,
         text: str,
-        provider: typing.Optional[Lang2FhirAndCreateRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Lang2FhirAndCreateResponse:
         """
@@ -231,10 +265,16 @@ class AsyncToolsClient:
         text : str
             Natural language text to convert to FHIR resource
 
-        provider : typing.Optional[Lang2FhirAndCreateRequestProvider]
-            FHIR provider to use for storing the resource
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -257,6 +297,8 @@ class AsyncToolsClient:
 
         async def main() -> None:
             await client.tools.create_fhir_resource(
+                phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+                phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
                 resource="auto",
                 text="Patient John Doe has severe asthma with acute exacerbation",
             )
@@ -265,7 +307,12 @@ class AsyncToolsClient:
         asyncio.run(main())
         """
         _response = await self._raw_client.create_fhir_resource(
-            resource=resource, text=text, provider=provider, meta=meta, request_options=request_options
+            resource=resource,
+            text=text,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
+            provider=provider,
+            request_options=request_options,
         )
         return _response.data
 
@@ -273,11 +320,12 @@ class AsyncToolsClient:
         self,
         *,
         text: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         patient_id: typing.Optional[str] = OMIT,
         practitioner_id: typing.Optional[str] = OMIT,
         count: typing.Optional[int] = OMIT,
-        provider: typing.Optional[Lang2FhirAndSearchRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Lang2FhirAndSearchResponse:
         """
@@ -288,6 +336,14 @@ class AsyncToolsClient:
         text : str
             Natural language text to convert to FHIR search parameters
 
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
+
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
         patient_id : typing.Optional[str]
             Patient ID to filter results
 
@@ -297,10 +353,8 @@ class AsyncToolsClient:
         count : typing.Optional[int]
             Maximum number of results to return
 
-        provider : typing.Optional[Lang2FhirAndSearchRequestProvider]
-            FHIR provider to use for searching
-
-        meta : typing.Optional[FhirClientConfig]
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -323,6 +377,8 @@ class AsyncToolsClient:
 
         async def main() -> None:
             await client.tools.search_fhir_resources(
+                phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+                phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
                 text="Find all appointments for patient John Doe next week",
             )
 
@@ -331,11 +387,12 @@ class AsyncToolsClient:
         """
         _response = await self._raw_client.search_fhir_resources(
             text=text,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
             patient_id=patient_id,
             practitioner_id=practitioner_id,
             count=count,
             provider=provider,
-            meta=meta,
             request_options=request_options,
         )
         return _response.data
@@ -344,8 +401,9 @@ class AsyncToolsClient:
         self,
         *,
         text: str,
-        provider: CohortRequestProvider,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CohortResponse:
         """
@@ -356,10 +414,16 @@ class AsyncToolsClient:
         text : str
             Natural language text describing the patient cohort criteria
 
-        provider : CohortRequestProvider
-            FHIR provider to use for searching
+        provider : str
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
+
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -382,14 +446,20 @@ class AsyncToolsClient:
 
         async def main() -> None:
             await client.tools.analyze_cohort(
+                phenoml_on_behalf_of="Patient/550e8400-e29b-41d4-a716-446655440000",
+                phenoml_fhir_provider="550e8400-e29b-41d4-a716-446655440000:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c...",
                 text="female patients over 20 with diabetes but not hypertension",
-                provider="medplum",
+                provider="550e8400-e29b-41d4-a716-446655440000",
             )
 
 
         asyncio.run(main())
         """
         _response = await self._raw_client.analyze_cohort(
-            text=text, provider=provider, meta=meta, request_options=request_options
+            text=text,
+            provider=provider,
+            phenoml_on_behalf_of=phenoml_on_behalf_of,
+            phenoml_fhir_provider=phenoml_fhir_provider,
+            request_options=request_options,
         )
         return _response.data

phenoml/tools/raw_client.py

@@ -8,19 +8,14 @@ from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.pydantic_utilities import parse_obj_as
 from ..core.request_options import RequestOptions
-from ..core.serialization import convert_and_respect_annotation_metadata
 from .errors.bad_request_error import BadRequestError
 from .errors.failed_dependency_error import FailedDependencyError
 from .errors.forbidden_error import ForbiddenError
 from .errors.internal_server_error import InternalServerError
 from .errors.unauthorized_error import UnauthorizedError
-from .types.cohort_request_provider import CohortRequestProvider
 from .types.cohort_response import CohortResponse
-from .types.fhir_client_config import FhirClientConfig
-from .types.lang2fhir_and_create_request_provider import Lang2FhirAndCreateRequestProvider
 from .types.lang2fhir_and_create_request_resource import Lang2FhirAndCreateRequestResource
 from .types.lang2fhir_and_create_response import Lang2FhirAndCreateResponse
-from .types.lang2fhir_and_search_request_provider import Lang2FhirAndSearchRequestProvider
 from .types.lang2fhir_and_search_response import Lang2FhirAndSearchResponse
 
 # this is used as the default value for optional parameters
@@ -36,8 +31,9 @@ class RawToolsClient:
         *,
         resource: Lang2FhirAndCreateRequestResource,
         text: str,
-        provider: typing.Optional[Lang2FhirAndCreateRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[Lang2FhirAndCreateResponse]:
         """
@@ -51,10 +47,16 @@ class RawToolsClient:
         text : str
             Natural language text to convert to FHIR resource
 
-        provider : typing.Optional[Lang2FhirAndCreateRequestProvider]
-            FHIR provider to use for storing the resource
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -71,12 +73,11 @@ class RawToolsClient:
                 "resource": resource,
                 "text": text,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -155,11 +156,12 @@ class RawToolsClient:
         self,
         *,
         text: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         patient_id: typing.Optional[str] = OMIT,
         practitioner_id: typing.Optional[str] = OMIT,
         count: typing.Optional[int] = OMIT,
-        provider: typing.Optional[Lang2FhirAndSearchRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[Lang2FhirAndSearchResponse]:
         """
@@ -170,6 +172,14 @@ class RawToolsClient:
         text : str
             Natural language text to convert to FHIR search parameters
 
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
+
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
         patient_id : typing.Optional[str]
             Patient ID to filter results
 
@@ -179,10 +189,8 @@ class RawToolsClient:
         count : typing.Optional[int]
             Maximum number of results to return
 
-        provider : typing.Optional[Lang2FhirAndSearchRequestProvider]
-            FHIR provider to use for searching
-
-        meta : typing.Optional[FhirClientConfig]
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -201,12 +209,11 @@ class RawToolsClient:
                 "practitioner_id": practitioner_id,
                 "count": count,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -285,8 +292,9 @@ class RawToolsClient:
         self,
         *,
         text: str,
-        provider: CohortRequestProvider,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[CohortResponse]:
         """
@@ -297,10 +305,16 @@ class RawToolsClient:
         text : str
             Natural language text describing the patient cohort criteria
 
-        provider : CohortRequestProvider
-            FHIR provider to use for searching
+        provider : str
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
+
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -316,12 +330,11 @@ class RawToolsClient:
             json={
                 "text": text,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -395,8 +408,9 @@ class AsyncRawToolsClient:
         *,
         resource: Lang2FhirAndCreateRequestResource,
         text: str,
-        provider: typing.Optional[Lang2FhirAndCreateRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[Lang2FhirAndCreateResponse]:
         """
@@ -410,10 +424,16 @@ class AsyncRawToolsClient:
         text : str
             Natural language text to convert to FHIR resource
 
-        provider : typing.Optional[Lang2FhirAndCreateRequestProvider]
-            FHIR provider to use for storing the resource
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -430,12 +450,11 @@ class AsyncRawToolsClient:
                 "resource": resource,
                 "text": text,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -514,11 +533,12 @@ class AsyncRawToolsClient:
         self,
         *,
         text: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         patient_id: typing.Optional[str] = OMIT,
         practitioner_id: typing.Optional[str] = OMIT,
         count: typing.Optional[int] = OMIT,
-        provider: typing.Optional[Lang2FhirAndSearchRequestProvider] = OMIT,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[Lang2FhirAndSearchResponse]:
         """
@@ -529,6 +549,14 @@ class AsyncRawToolsClient:
         text : str
             Natural language text to convert to FHIR search parameters
 
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
+
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
+
         patient_id : typing.Optional[str]
             Patient ID to filter results
 
@@ -538,10 +566,8 @@ class AsyncRawToolsClient:
         count : typing.Optional[int]
             Maximum number of results to return
 
-        provider : typing.Optional[Lang2FhirAndSearchRequestProvider]
-            FHIR provider to use for searching
-
-        meta : typing.Optional[FhirClientConfig]
+        provider : typing.Optional[str]
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -560,12 +586,11 @@ class AsyncRawToolsClient:
                 "practitioner_id": practitioner_id,
                 "count": count,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -644,8 +669,9 @@ class AsyncRawToolsClient:
         self,
         *,
         text: str,
-        provider: CohortRequestProvider,
-        meta: typing.Optional[FhirClientConfig] = OMIT,
+        provider: str,
+        phenoml_on_behalf_of: typing.Optional[str] = None,
+        phenoml_fhir_provider: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[CohortResponse]:
         """
@@ -656,10 +682,16 @@ class AsyncRawToolsClient:
         text : str
             Natural language text describing the patient cohort criteria
 
-        provider : CohortRequestProvider
-            FHIR provider to use for searching
+        provider : str
+            FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum)
+
+        phenoml_on_behalf_of : typing.Optional[str]
+            Optional header for on-behalf-of authentication. Used when making requests on behalf of another user or entity.
+            Must be in the format: Patient/{uuid} or Practitioner/{uuid}
 
-        meta : typing.Optional[FhirClientConfig]
+        phenoml_fhir_provider : typing.Optional[str]
+            Optional header for FHIR provider authentication. Contains credentials in the format {fhir_provider_id}:{oauth2_token}.
+            Multiple FHIR provider integrations can be provided as comma-separated values.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -675,12 +707,11 @@ class AsyncRawToolsClient:
             json={
                 "text": text,
                 "provider": provider,
-                "meta": convert_and_respect_annotation_metadata(
-                    object_=meta, annotation=FhirClientConfig, direction="write"
-                ),
             },
             headers={
                 "content-type": "application/json",
+                "X-Phenoml-On-Behalf-Of": str(phenoml_on_behalf_of) if phenoml_on_behalf_of is not None else None,
+                "X-Phenoml-Fhir-Provider": str(phenoml_fhir_provider) if phenoml_fhir_provider is not None else None,
             },
             request_options=request_options,
             omit=OMIT,