Fix more issues

h3xxit · h3xxit · commit d13bade21b60 · 2025-10-24T18:19:55.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/cli",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "CLI utilities for UTCP",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -43,7 +43,7 @@
     }
   },
   "dependencies": {
-    "@utcp/sdk": "^1.0.11"
+    "@utcp/sdk": "^1.0.15"
   },
   "devDependencies": {
     "bun-types": "latest",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/sdk",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Universal Tool Calling Protocol SDK",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
diff --git a/packages/core/src/implementations/default_variable_substitutor.ts b/packages/core/src/implementations/default_variable_substitutor.ts
@@ -36,7 +36,7 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {
     // --- Search Hierarchy ---
 
     // 1. Check config.variables (highest precedence)
-    if (config.variables && config.variables[effectiveKey]) {
+    if (config.variables && effectiveKey in config.variables) {
       return config.variables[effectiveKey];
     }
 
@@ -78,7 +78,7 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {
     }
 
     const objString = JSON.stringify(obj);
-    if (objString.includes('$ref')) {
+    if (objString && objString.includes('$ref')) {
       return obj;
     }
 
@@ -152,8 +152,9 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {
         const varNameInTemplate = match[1] || match[2];
         
         // Apply Python SDK's double underscore namespacing:
+        // Replaces underscores in namespace with double underscores, then adds single underscore before variable
         const effectiveNamespace = namespace ? namespace.replace(/_/g, '__') : undefined;
-        const prefixedVarName = effectiveNamespace ? `${effectiveNamespace}__${varNameInTemplate}` : varNameInTemplate;
+        const prefixedVarName = effectiveNamespace ? `${effectiveNamespace}_${varNameInTemplate}` : varNameInTemplate;
         
         variables.push(prefixedVarName);
       }
diff --git a/packages/direct-call/package.json b/packages/direct-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/direct-call",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Direct callable functions plugin for UTCP",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -44,7 +44,7 @@
     }
   },
   "dependencies": {
-    "@utcp/sdk": "^1.0.11"
+    "@utcp/sdk": "^1.0.15"
   },
   "devDependencies": {
     "bun-types": "latest",
diff --git a/packages/dotenv-loader/package.json b/packages/dotenv-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/dotenv-loader",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "DotEnv Variable Loader plugin for UTCP",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -44,7 +44,7 @@
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "@utcp/sdk": "^1.0.8"
+    "@utcp/sdk": "^1.0.15"
   },
   "devDependencies": {
     "bun-types": "latest",
diff --git a/packages/file/package.json b/packages/file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/file",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "File system protocol for UTCP - reads UTCP manuals from local files (Node.js only)",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -43,8 +43,8 @@
     }
   },
   "dependencies": {
-    "@utcp/sdk": "^1.0.8",
-    "@utcp/http": "^1.0.7",
+    "@utcp/sdk": "^1.0.15",
+    "@utcp/http": "^1.0.13",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/http/package.json b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/http",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "HTTP utilities for UTCP",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -43,7 +43,7 @@
     }
   },
   "dependencies": {
-    "@utcp/sdk": "^1.0.14",
+    "@utcp/sdk": "^1.0.15",
     "axios": "^1.11.0",
     "js-yaml": "^4.1.0"
   },
diff --git a/packages/http/src/http_communication_protocol.ts b/packages/http/src/http_communication_protocol.ts
@@ -243,11 +243,13 @@ export class HttpCommunicationProtocol implements CommunicationProtocol {
         if (!apiKeyAuth.api_key) {
           throw new Error("API key for ApiKeyAuth is empty.");
         }
-        if (apiKeyAuth.location === 'header') {
+        // Default to 'header' if location is not specified
+        const location = apiKeyAuth.location || 'header';
+        if (location === 'header') {
           requestConfig.headers = { ...requestConfig.headers, [apiKeyAuth.var_name]: apiKeyAuth.api_key };
-        } else if (apiKeyAuth.location === 'query') {
+        } else if (location === 'query') {
           requestConfig.params = { ...requestConfig.params, [apiKeyAuth.var_name]: apiKeyAuth.api_key };
-        } else if (apiKeyAuth.location === 'cookie') {
+        } else if (location === 'cookie') {
           cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
         }
       } else if (httpCallTemplate.auth.auth_type === 'basic') {
diff --git a/packages/http/src/openapi_converter.ts b/packages/http/src/openapi_converter.ts
@@ -33,6 +33,7 @@ export interface OpenApiConverterOptions {
   specUrl?: string;
   callTemplateName?: string;
   authTools?: Auth;
+  baseUrl?: string;
 }
 
 /**
@@ -47,6 +48,7 @@ export interface OpenApiConverterOptions {
 export class OpenApiConverter {
   private spec: Record<string, any>;
   private spec_url: string | undefined;
+  private base_url: string | undefined;
   private auth_tools: Auth | undefined;
   private placeholder_counter: number = 0;
   private call_template_name: string;
@@ -55,14 +57,16 @@ export class OpenApiConverter {
    * Initializes the OpenAPI converter.
    *
    * @param openapi_spec Parsed OpenAPI specification as a dictionary.
-   * @param options Optional settings including spec_url, call_template_name, and auth_tools.
+   * @param options Optional settings including spec_url, call_template_name, auth_tools, and baseUrl.
    *     - specUrl: URL where the specification was retrieved from.
    *     - callTemplateName: Custom name for the call_template if spec title not provided.
    *     - authTools: Optional auth configuration for generated tools.
+   *     - baseUrl: Optional base URL override for all API endpoints.
    */
   constructor(openapi_spec: Record<string, any>, options?: OpenApiConverterOptions) {
     this.spec = openapi_spec;
     this.spec_url = options?.specUrl;
+    this.base_url = options?.baseUrl;
     this.auth_tools = options?.authTools;
     this.placeholder_counter = 0;
 
@@ -105,18 +109,30 @@ export class OpenApiConverter {
     const tools: Tool[] = [];
     let baseUrl = '/';
 
-    const servers = this.spec.servers;
-    if (servers && Array.isArray(servers) && servers.length > 0 && servers[0].url) {
-      baseUrl = servers[0].url;
-    } else if (this.spec_url) {
+    // 1. Explicit baseUrl option (highest priority)
+    if (this.base_url) {
+      baseUrl = this.base_url;
+    }
+    // 2. OpenAPI 3.0 servers field
+    else if (this.spec.servers && Array.isArray(this.spec.servers) && this.spec.servers.length > 0 && this.spec.servers[0].url) {
+      baseUrl = this.spec.servers[0].url;
+    }
+    // 3. OpenAPI 2.0 host and basePath fields
+    else if (this.spec.host) {
+      const scheme = this.spec.schemes?.[0] || 'https';
+      const basePath = this.spec.basePath || '';
+      baseUrl = `${scheme}://${this.spec.host}${basePath}`;
+    }
+    // 4. Fallback to spec_url ONLY if it's an HTTP/HTTPS URL
+    else if (this.spec_url && (this.spec_url.startsWith('http://') || this.spec_url.startsWith('https://'))) {
       try {
         const parsedUrl = new URL(this.spec_url);
         baseUrl = `${parsedUrl.protocol}//${parsedUrl.host}`;
       } catch (e) {
         console.error(`[OpenApiConverter] Invalid spec_url provided: ${this.spec_url}`);
       }
     } else {
-      console.warn("[OpenApiConverter] No server info or spec URL provided. Using fallback base URL: '/'");
+      console.warn("[OpenApiConverter] No server info found in OpenAPI spec. Using fallback base URL: '/'. Tools may not work correctly without a valid base URL.");
     }
 
     const paths = this.spec.paths || {};
diff --git a/packages/http/src/sse_communication_protocol.ts b/packages/http/src/sse_communication_protocol.ts
@@ -43,11 +43,13 @@ export class SseCommunicationProtocol implements CommunicationProtocol {
       if ('api_key' in provider.auth) {
         const apiKeyAuth = provider.auth as ApiKeyAuth;
         if (apiKeyAuth.api_key) {
-          if (apiKeyAuth.location === 'header') {
+          // Default to 'header' if location is not specified
+          const location = apiKeyAuth.location || 'header';
+          if (location === 'header') {
             headers[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === 'query') {
+          } else if (location === 'query') {
             queryParams[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === 'cookie') {
+          } else if (location === 'cookie') {
             cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
           }
         } else {
diff --git a/packages/http/src/streamable_http_communication_protocol.ts b/packages/http/src/streamable_http_communication_protocol.ts
@@ -43,11 +43,13 @@ export class StreamableHttpCommunicationProtocol implements CommunicationProtoco
       if ('api_key' in provider.auth) {
         const apiKeyAuth = provider.auth as ApiKeyAuth;
         if (apiKeyAuth.api_key) {
-          if (apiKeyAuth.location === 'header') {
+          // Default to 'header' if location is not specified
+          const location = apiKeyAuth.location || 'header';
+          if (location === 'header') {
             headers[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === 'query') {
+          } else if (location === 'query') {
             queryParams[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === 'cookie') {
+          } else if (location === 'cookie') {
             cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
           }
         } else {
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/mcp",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Model Context Protocol integration for UTCP",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.17.4",
-    "@utcp/sdk": "^1.0.11",
+    "@utcp/sdk": "^1.0.15",
     "axios": "^1.11.0"
   },
   "devDependencies": {
diff --git a/packages/text/package.json b/packages/text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@utcp/text",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Text content protocol for UTCP - handles direct text content (browser-compatible)",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -38,8 +38,8 @@
     }
   },
   "dependencies": {
-    "@utcp/http": "^1.0.11",
-    "@utcp/sdk": "^1.0.11",
+    "@utcp/http": "^1.0.13",
+    "@utcp/sdk": "^1.0.15",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/text/src/text_call_template.ts b/packages/text/src/text_call_template.ts
@@ -12,12 +12,14 @@ import { Serializer } from '@utcp/sdk';
  * Attributes:
  *     call_template_type: Always "text" for text call templates.
  *     content: Direct text content of the UTCP manual or tool definitions (required).
+ *     base_url: Optional base URL for API endpoints when converting OpenAPI specs. Overrides spec's server configuration.
  *     auth: Always undefined - text call templates don't support authentication.
  *     auth_tools: Optional authentication to apply to generated tools from OpenAPI specs.
  */
 export interface TextCallTemplate extends CallTemplate {
   call_template_type: 'text';
   content: string;
+  base_url?: string;
   auth?: undefined;
   auth_tools?: Auth | null;
 }
@@ -29,6 +31,7 @@ export const TextCallTemplateSchema: z.ZodType<TextCallTemplate> = z.object({
   name: z.string().optional(),
   call_template_type: z.literal('text'),
   content: z.string().describe('Direct text content of the UTCP manual or tool definitions'),
+  base_url: z.string().optional().describe('Optional base URL for API endpoints when converting OpenAPI specs'),
   auth: z.undefined().optional(),
   auth_tools: AuthSchema.nullable().optional().transform((val) => {
     if (val === null || val === undefined) return null;
@@ -48,6 +51,7 @@ export class TextCallTemplateSerializer extends Serializer<TextCallTemplate> {
       name: obj.name,
       call_template_type: obj.call_template_type,
       content: obj.content,
+      base_url: obj.base_url,
       auth: obj.auth,
       auth_tools: obj.auth_tools ? new AuthSerializer().toDict(obj.auth_tools) : null,
     };
diff --git a/packages/text/src/text_communication_protocol.ts b/packages/text/src/text_communication_protocol.ts
@@ -53,6 +53,7 @@ export class TextCommunicationProtocol implements CommunicationProtocol {
           specUrl: 'text://content',
           callTemplateName: textCallTemplate.name,
           authTools: textCallTemplate.auth_tools || undefined,
+          baseUrl: textCallTemplate.base_url,
         });
         utcpManual = converter.convert();
       } else {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@utcp/sdk",`
`3`		`- "version": "1.0.14",`
	`3`	`+ "version": "1.0.15",`
`4`	`4`	`"description": "Universal Tool Calling Protocol SDK",`
`5`	`5`	`"main": "dist/index.cjs",`
`6`	`6`	`"module": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {`
`36`	`36`	`// --- Search Hierarchy ---`
`37`	`37`
`38`	`38`	`// 1. Check config.variables (highest precedence)`
`39`		`- if (config.variables && config.variables[effectiveKey]) {`
	`39`	`+ if (config.variables && effectiveKey in config.variables) {`
`40`	`40`	`return config.variables[effectiveKey];`
`41`	`41`	`}`
`42`	`42`
`@@ -78,7 +78,7 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`const objString = JSON.stringify(obj);`
`81`		`- if (objString.includes('$ref')) {`
	`81`	`+ if (objString && objString.includes('$ref')) {`
`82`	`82`	`return obj;`
`83`	`83`	`}`
`84`	`84`
`@@ -152,8 +152,9 @@ export class DefaultVariableSubstitutor implements VariableSubstitutor {`
`152`	`152`	`const varNameInTemplate = match[1] \|\| match[2];`
`153`	`153`
`154`	`154`	`// Apply Python SDK's double underscore namespacing:`
	`155`	`+ // Replaces underscores in namespace with double underscores, then adds single underscore before variable`
`155`	`156`	`const effectiveNamespace = namespace ? namespace.replace(/_/g, '__') : undefined;`
`156`		- const prefixedVarName = effectiveNamespace ? `${effectiveNamespace}__${varNameInTemplate}` : varNameInTemplate;
	`157`	+ const prefixedVarName = effectiveNamespace ? `${effectiveNamespace}_${varNameInTemplate}` : varNameInTemplate;
`157`	`158`
`158`	`159`	`variables.push(prefixedVarName);`
`159`	`160`	`}`