phenoml 0.0.3 → 0.0.4

package/dist/esm/api/resources/tools/client/Client.mjs

@@ -17,7 +17,7 @@ import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.
 import * as errors from "../../../../errors/index.mjs";
 import { McpServer } from "../resources/mcpServer/client/Client.mjs";
 export class Tools {
-    constructor(_options) {
+    constructor(_options = {}) {
         this._options = _options;
     }
     get mcpServer() {
@@ -197,7 +197,7 @@ export class Tools {
      * @example
      *     await client.tools.analyzeCohort({
      *         text: "female patients over 20 with diabetes but not hypertension",
-     *         provider: "medplum"
+     *         provider: "550e8400-e29b-41d4-a716-446655440000"
      *     })
      */
     analyzeCohort(request, requestOptions) {
@@ -259,7 +259,11 @@ export class Tools {
     }
     _getAuthorizationHeader() {
         return __awaiter(this, void 0, void 0, function* () {
-            return `Bearer ${yield core.Supplier.get(this._options.token)}`;
+            const bearer = yield core.Supplier.get(this._options.token);
+            if (bearer != null) {
+                return `Bearer ${bearer}`;
+            }
+            return undefined;
         });
     }
 }

package/dist/esm/api/resources/tools/client/requests/CohortRequest.d.mts

@@ -1,30 +1,16 @@
 /**
  * This file was auto-generated by Fern from our API Definition.
  */
-import * as phenoml from "../../../../index.mjs";
 /**
  * @example
  *     {
  *         text: "female patients over 20 with diabetes but not hypertension",
- *         provider: "medplum"
+ *         provider: "550e8400-e29b-41d4-a716-446655440000"
  *     }
  */
 export interface CohortRequest {
     /** Natural language text describing the patient cohort criteria */
     text: string;
-    /** FHIR provider to use for searching */
-    provider: CohortRequest.Provider;
-    meta?: phenoml.tools.FhirClientConfig;
-}
-export declare namespace CohortRequest {
-    /**
-     * FHIR provider to use for searching
-     */
-    type Provider = "medplum" | "google_healthcare" | "canvas" | "hapi";
-    const Provider: {
-        readonly Medplum: "medplum";
-        readonly GoogleHealthcare: "google_healthcare";
-        readonly Canvas: "canvas";
-        readonly Hapi: "hapi";
-    };
+    /** FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum) */
+    provider: string;
 }

package/dist/esm/api/resources/tools/client/requests/CohortRequest.mjs

@@ -1,12 +1,4 @@
 /**
  * This file was auto-generated by Fern from our API Definition.
  */
-export var CohortRequest;
-(function (CohortRequest) {
-    CohortRequest.Provider = {
-        Medplum: "medplum",
-        GoogleHealthcare: "google_healthcare",
-        Canvas: "canvas",
-        Hapi: "hapi",
-    };
-})(CohortRequest || (CohortRequest = {}));
+export {};

package/dist/esm/api/resources/tools/client/requests/Lang2FhirAndCreateRequest.d.mts

@@ -1,7 +1,6 @@
 /**
  * This file was auto-generated by Fern from our API Definition.
  */
-import * as phenoml from "../../../../index.mjs";
 /**
  * @example
  *     {
@@ -14,9 +13,8 @@ export interface Lang2FhirAndCreateRequest {
     resource: Lang2FhirAndCreateRequest.Resource;
     /** Natural language text to convert to FHIR resource */
     text: string;
-    /** FHIR provider to use for storing the resource */
-    provider?: Lang2FhirAndCreateRequest.Provider;
-    meta?: phenoml.tools.FhirClientConfig;
+    /** FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum) */
+    provider?: string;
 }
 export declare namespace Lang2FhirAndCreateRequest {
     /**
@@ -41,14 +39,4 @@ export declare namespace Lang2FhirAndCreateRequest {
         readonly SimpleObservation: "simple-observation";
         readonly VitalSigns: "vital-signs";
     };
-    /**
-     * FHIR provider to use for storing the resource
-     */
-    type Provider = "medplum" | "google_healthcare" | "canvas" | "hapi";
-    const Provider: {
-        readonly Medplum: "medplum";
-        readonly GoogleHealthcare: "google_healthcare";
-        readonly Canvas: "canvas";
-        readonly Hapi: "hapi";
-    };
 }

package/dist/esm/api/resources/tools/client/requests/Lang2FhirAndCreateRequest.mjs

@@ -21,10 +21,4 @@ export var Lang2FhirAndCreateRequest;
         SimpleObservation: "simple-observation",
         VitalSigns: "vital-signs",
     };
-    Lang2FhirAndCreateRequest.Provider = {
-        Medplum: "medplum",
-        GoogleHealthcare: "google_healthcare",
-        Canvas: "canvas",
-        Hapi: "hapi",
-    };
 })(Lang2FhirAndCreateRequest || (Lang2FhirAndCreateRequest = {}));

package/dist/esm/api/resources/tools/client/requests/Lang2FhirAndSearchRequest.d.mts

@@ -1,7 +1,6 @@
 /**
  * This file was auto-generated by Fern from our API Definition.
  */
-import * as phenoml from "../../../../index.mjs";
 /**
  * @example
  *     {
@@ -17,19 +16,6 @@ export interface Lang2FhirAndSearchRequest {
     practitioner_id?: string;
     /** Maximum number of results to return */
     count?: number;
-    /** FHIR provider to use for searching */
-    provider?: Lang2FhirAndSearchRequest.Provider;
-    meta?: phenoml.tools.FhirClientConfig;
-}
-export declare namespace Lang2FhirAndSearchRequest {
-    /**
-     * FHIR provider to use for searching
-     */
-    type Provider = "medplum" | "google_healthcare" | "canvas" | "hapi";
-    const Provider: {
-        readonly Medplum: "medplum";
-        readonly GoogleHealthcare: "google_healthcare";
-        readonly Canvas: "canvas";
-        readonly Hapi: "hapi";
-    };
+    /** FHIR provider ID - must be a valid UUID from existing FHIR providers. also supports provider by name (e.g. medplum) */
+    provider?: string;
 }

package/dist/esm/api/resources/tools/client/requests/Lang2FhirAndSearchRequest.mjs

@@ -1,12 +1,4 @@
 /**
  * This file was auto-generated by Fern from our API Definition.
  */
-export var Lang2FhirAndSearchRequest;
-(function (Lang2FhirAndSearchRequest) {
-    Lang2FhirAndSearchRequest.Provider = {
-        Medplum: "medplum",
-        GoogleHealthcare: "google_healthcare",
-        Canvas: "canvas",
-        Hapi: "hapi",
-    };
-})(Lang2FhirAndSearchRequest || (Lang2FhirAndSearchRequest = {}));
+export {};

package/dist/esm/api/resources/tools/resources/mcpServer/client/Client.d.mts

@@ -10,9 +10,9 @@ export declare namespace McpServer {
         environment?: core.Supplier<environments.phenomlEnvironment | string>;
         /** Specify a custom URL to connect the client to. */
         baseUrl?: core.Supplier<string>;
-        token: core.Supplier<core.BearerToken>;
+        token?: core.Supplier<core.BearerToken | undefined>;
         /** Additional headers to include in requests. */
-        headers?: Record<string, string | core.Supplier<string | undefined> | undefined>;
+        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {
@@ -25,13 +25,13 @@ export declare namespace McpServer {
         /** Additional query string parameters to include in the request. */
         queryParams?: Record<string, unknown>;
         /** Additional headers to include in the request. */
-        headers?: Record<string, string | core.Supplier<string | undefined> | undefined>;
+        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
     }
 }
 export declare class McpServer {
     protected readonly _options: McpServer.Options;
     protected _tools: Tools | undefined;
-    constructor(_options: McpServer.Options);
+    constructor(_options?: McpServer.Options);
     get tools(): Tools;
     /**
      * Creates a new MCP server
@@ -96,5 +96,5 @@ export declare class McpServer {
      */
     delete(mcpServerId: string, requestOptions?: McpServer.RequestOptions): core.HttpResponsePromise<phenoml.tools.McpServerResponse>;
     private __delete;
-    protected _getAuthorizationHeader(): Promise<string>;
+    protected _getAuthorizationHeader(): Promise<string | undefined>;
 }

package/dist/esm/api/resources/tools/resources/mcpServer/client/Client.mjs

@@ -17,7 +17,7 @@ import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../core/he
 import * as errors from "../../../../../../errors/index.mjs";
 import { Tools } from "../resources/tools/client/Client.mjs";
 export class McpServer {
-    constructor(_options) {
+    constructor(_options = {}) {
         this._options = _options;
     }
     get tools() {
@@ -294,7 +294,11 @@ export class McpServer {
     }
     _getAuthorizationHeader() {
         return __awaiter(this, void 0, void 0, function* () {
-            return `Bearer ${yield core.Supplier.get(this._options.token)}`;
+            const bearer = yield core.Supplier.get(this._options.token);
+            if (bearer != null) {
+                return `Bearer ${bearer}`;
+            }
+            return undefined;
         });
     }
 }

package/dist/esm/api/resources/tools/resources/mcpServer/resources/tools/client/Client.d.mts

@@ -9,9 +9,9 @@ export declare namespace Tools {
         environment?: core.Supplier<environments.phenomlEnvironment | string>;
         /** Specify a custom URL to connect the client to. */
         baseUrl?: core.Supplier<string>;
-        token: core.Supplier<core.BearerToken>;
+        token?: core.Supplier<core.BearerToken | undefined>;
         /** Additional headers to include in requests. */
-        headers?: Record<string, string | core.Supplier<string | undefined> | undefined>;
+        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {
@@ -24,12 +24,12 @@ export declare namespace Tools {
         /** Additional query string parameters to include in the request. */
         queryParams?: Record<string, unknown>;
         /** Additional headers to include in the request. */
-        headers?: Record<string, string | core.Supplier<string | undefined> | undefined>;
+        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
     }
 }
 export declare class Tools {
     protected readonly _options: Tools.Options;
-    constructor(_options: Tools.Options);
+    constructor(_options?: Tools.Options);
     /**
      * Lists all MCP server tools for a specific MCP server
      *
@@ -96,5 +96,5 @@ export declare class Tools {
      */
     call(mcpServerToolId: string, request: phenoml.tools.mcpServer.McpServerToolCallRequest, requestOptions?: Tools.RequestOptions): core.HttpResponsePromise<phenoml.tools.McpServerToolCallResponse>;
     private __call;
-    protected _getAuthorizationHeader(): Promise<string>;
+    protected _getAuthorizationHeader(): Promise<string | undefined>;
 }

package/dist/esm/api/resources/tools/resources/mcpServer/resources/tools/client/Client.mjs

@@ -16,7 +16,7 @@ import * as phenoml from "../../../../../../../index.mjs";
 import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../../../core/headers.mjs";
 import * as errors from "../../../../../../../../errors/index.mjs";
 export class Tools {
-    constructor(_options) {
+    constructor(_options = {}) {
         this._options = _options;
     }
     /**
@@ -295,7 +295,11 @@ export class Tools {
     }
     _getAuthorizationHeader() {
         return __awaiter(this, void 0, void 0, function* () {
-            return `Bearer ${yield core.Supplier.get(this._options.token)}`;
+            const bearer = yield core.Supplier.get(this._options.token);
+            if (bearer != null) {
+                return `Bearer ${bearer}`;
+            }
+            return undefined;
         });
     }
 }

package/dist/esm/api/resources/tools/types/index.d.mts

@@ -4,5 +4,4 @@ export * from "./CohortResponse.mjs";
 export * from "./McpServerResponse.mjs";
 export * from "./McpServerToolCallResponse.mjs";
 export * from "./McpServerToolResponse.mjs";
-export * from "./FhirClientConfig.mjs";
 export * from "./SearchConcept.mjs";

package/dist/esm/api/resources/tools/types/index.mjs

@@ -4,5 +4,4 @@ export * from "./CohortResponse.mjs";
 export * from "./McpServerResponse.mjs";
 export * from "./McpServerToolCallResponse.mjs";
 export * from "./McpServerToolResponse.mjs";
-export * from "./FhirClientConfig.mjs";
 export * from "./SearchConcept.mjs";

package/dist/esm/core/fetcher/Fetcher.d.mts

@@ -6,7 +6,7 @@ export declare namespace Fetcher {
         url: string;
         method: string;
         contentType?: string;
-        headers?: Record<string, string | Supplier<string | undefined> | undefined>;
+        headers?: Record<string, string | Supplier<string | null | undefined> | null | undefined>;
         queryParameters?: Record<string, unknown>;
         body?: unknown;
         timeoutMs?: number;

package/dist/esm/core/fetcher/requestWithRetries.mjs

@@ -11,21 +11,57 @@ const INITIAL_RETRY_DELAY = 1000; // in milliseconds
 const MAX_RETRY_DELAY = 60000; // in milliseconds
 const DEFAULT_MAX_RETRIES = 2;
 const JITTER_FACTOR = 0.2; // 20% random jitter
-function addJitter(delay) {
-    // Generate a random value between -JITTER_FACTOR and +JITTER_FACTOR
-    const jitterMultiplier = 1 + (Math.random() * 2 - 1) * JITTER_FACTOR;
+function addPositiveJitter(delay) {
+    // Generate a random value between 0 and +JITTER_FACTOR
+    const jitterMultiplier = 1 + Math.random() * JITTER_FACTOR;
     return delay * jitterMultiplier;
 }
+function addSymmetricJitter(delay) {
+    // Generate a random value in a JITTER_FACTOR-sized percentage range around delay
+    const jitterMultiplier = 1 + (Math.random() - 0.5) * JITTER_FACTOR;
+    return delay * jitterMultiplier;
+}
+function getRetryDelayFromHeaders(response, retryAttempt) {
+    // Check for Retry-After header first (RFC 7231), with no jitter
+    const retryAfter = response.headers.get("Retry-After");
+    if (retryAfter) {
+        // Parse as number of seconds...
+        const retryAfterSeconds = parseInt(retryAfter, 10);
+        if (!isNaN(retryAfterSeconds) && retryAfterSeconds > 0) {
+            return Math.min(retryAfterSeconds * 1000, MAX_RETRY_DELAY);
+        }
+        // ...or as an HTTP date; both are valid
+        const retryAfterDate = new Date(retryAfter);
+        if (!isNaN(retryAfterDate.getTime())) {
+            const delay = retryAfterDate.getTime() - Date.now();
+            if (delay > 0) {
+                return Math.min(Math.max(delay, 0), MAX_RETRY_DELAY);
+            }
+        }
+    }
+    // Then check for industry-standard X-RateLimit-Reset header, with positive jitter
+    const rateLimitReset = response.headers.get("X-RateLimit-Reset");
+    if (rateLimitReset) {
+        const resetTime = parseInt(rateLimitReset, 10);
+        if (!isNaN(resetTime)) {
+            // Assume Unix timestamp in epoch seconds
+            const delay = resetTime * 1000 - Date.now();
+            if (delay > 0) {
+                return addPositiveJitter(Math.min(delay, MAX_RETRY_DELAY));
+            }
+        }
+    }
+    // Fall back to exponential backoff, with symmetric jitter
+    return addSymmetricJitter(Math.min(INITIAL_RETRY_DELAY * Math.pow(2, retryAttempt), MAX_RETRY_DELAY));
+}
 export function requestWithRetries(requestFn_1) {
     return __awaiter(this, arguments, void 0, function* (requestFn, maxRetries = DEFAULT_MAX_RETRIES) {
         let response = yield requestFn();
         for (let i = 0; i < maxRetries; ++i) {
             if ([408, 429].includes(response.status) || response.status >= 500) {
-                // Calculate base delay using exponential backoff (in milliseconds)
-                const baseDelay = Math.min(INITIAL_RETRY_DELAY * Math.pow(2, i), MAX_RETRY_DELAY);
-                // Add jitter to the delay
-                const delayWithJitter = addJitter(baseDelay);
-                yield new Promise((resolve) => setTimeout(resolve, delayWithJitter));
+                // Get delay with appropriate jitter applied
+                const delay = getRetryDelayFromHeaders(response, i);
+                yield new Promise((resolve) => setTimeout(resolve, delay));
                 response = yield requestFn();
             }
             else {

package/dist/esm/core/headers.d.mts

@@ -1,3 +1,3 @@
 import * as core from "./index.mjs";
-export declare function mergeHeaders(...headersArray: (Record<string, string | core.Supplier<string | undefined> | undefined> | undefined)[]): Record<string, string | core.Supplier<string | undefined>>;
-export declare function mergeOnlyDefinedHeaders(...headersArray: (Record<string, string | core.Supplier<string | undefined> | undefined> | undefined)[]): Record<string, string | core.Supplier<string | undefined>>;
+export declare function mergeHeaders(...headersArray: (Record<string, string | core.Supplier<string | null | undefined> | null | undefined> | null | undefined)[]): Record<string, string | core.Supplier<string | null | undefined>>;
+export declare function mergeOnlyDefinedHeaders(...headersArray: (Record<string, string | core.Supplier<string | null | undefined> | null | undefined> | null | undefined)[]): Record<string, string | core.Supplier<string | null | undefined>>;

package/dist/esm/version.d.mts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.0.2";
+export declare const SDK_VERSION = "0.0.4";

package/dist/esm/version.mjs

@@ -1 +1 @@
-export const SDK_VERSION = "0.0.2";
+export const SDK_VERSION = "0.0.4";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "phenoml",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "private": false,
     "repository": "github:phenoml/phenoml-ts-sdk",
     "type": "commonjs",
@@ -35,7 +35,6 @@
         "build:esm": "tsc --project ./tsconfig.esm.json && node scripts/rename-to-esm-files.js dist/esm",
         "test": "jest --config jest.config.mjs",
         "test:unit": "jest --selectProjects unit",
-        "test:browser": "jest --selectProjects browser",
         "test:wire": "jest --selectProjects wire"
     },
     "devDependencies": {