hypha-rpc 0.20.41 → 0.20.43

package/dist/hypha-rpc-websocket.js

@@ -525,14 +525,10 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
   async get_manager_service(config) {
     config = config || {};
-    let { timeout, case_conversion } = config;
     (0,_utils__WEBPACK_IMPORTED_MODULE_0__.assert)(this._connection.manager_id, "Manager id is not set");
     const svc = await this.get_remote_service(
       `*/${this._connection.manager_id}:default`,
-      {
-        timeout: timeout,
-        case_conversion: case_conversion,
-      },
+      config,
     );
     return svc;
   }
@@ -569,7 +565,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     );
   }
   async get_remote_service(service_uri, config) {
-    let { timeout, case_conversion } = config || {};
+    let { timeout, case_conversion, kwargs_expansion } = config || {};
     timeout = timeout === undefined ? this._method_timeout : timeout;
     if (!service_uri && this._connection.manager_id) {
       service_uri = "*/" + this._connection.manager_id;
@@ -597,12 +593,15 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         _rpromise: true,
         _rdoc: "Get a remote service",
       });
-      const svc = await (0,_utils__WEBPACK_IMPORTED_MODULE_0__.waitFor)(
+      let svc = await (0,_utils__WEBPACK_IMPORTED_MODULE_0__.waitFor)(
         method(service_id),
         timeout,
         "Timeout Error: Failed to get remote service: " + service_uri,
       );
       svc.id = `${provider}:${service_id}`;
+      if (kwargs_expansion) {
+        svc = (0,_utils__WEBPACK_IMPORTED_MODULE_0__.expandKwargs)(svc);
+      }
       if (case_conversion)
         return Object.assign(
           new RemoteService(),
@@ -1817,6 +1816,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   cacheRequirements: () => (/* binding */ cacheRequirements),
 /* harmony export */   convertCase: () => (/* binding */ convertCase),
 /* harmony export */   dtypeToTypedArray: () => (/* binding */ dtypeToTypedArray),
+/* harmony export */   expandKwargs: () => (/* binding */ expandKwargs),
 /* harmony export */   loadRequirements: () => (/* binding */ loadRequirements),
 /* harmony export */   loadRequirementsInWebworker: () => (/* binding */ loadRequirementsInWebworker),
 /* harmony export */   loadRequirementsInWindow: () => (/* binding */ loadRequirementsInWindow),
@@ -1848,6 +1848,56 @@ function toSnakeCase(str) {
   return str.replace(/([A-Z])/g, "_$1").toLowerCase();
 }
 
+function expandKwargs(obj) {
+  if (typeof obj !== "object" || obj === null) {
+    return obj; // Return the value if obj is not an object
+  }
+
+  const newObj = Array.isArray(obj) ? [] : {};
+
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      const value = obj[key];
+
+      if (typeof value === "function") {
+        newObj[key] = (...args) => {
+          if (args.length === 0) {
+            throw new Error(`Function "${key}" expects at least one argument.`);
+          }
+
+          // Check if the last argument is an object
+          const lastArg = args[args.length - 1];
+          let kwargs = {};
+
+          if (
+            typeof lastArg === "object" &&
+            lastArg !== null &&
+            !Array.isArray(lastArg)
+          ) {
+            // Extract kwargs from the last argument
+            kwargs = { ...lastArg, _rkwarg: true };
+            args = args.slice(0, -1); // Remove the last argument from args
+          }
+
+          // Call the original function with positional args followed by kwargs
+          return value(...args, kwargs);
+        };
+
+        // Preserve metadata like __name__ and __schema__
+        newObj[key].__name__ = key;
+        if (value.__schema__) {
+          newObj[key].__schema__ = { ...value.__schema__ };
+          newObj[key].__schema__.name = key;
+        }
+      } else {
+        newObj[key] = expandKwargs(value); // Recursively process nested objects
+      }
+    }
+  }
+
+  return newObj;
+}
+
 function convertCase(obj, caseType) {
   if (typeof obj !== "object" || obj === null || !caseType) {
     return obj; // Return the value if obj is not an object
@@ -5036,6 +5086,7 @@ async function connectToServer(config) {
   const wm = await rpc.get_manager_service({
     timeout: config.method_timeout,
     case_conversion: "camel",
+    kwargs_expansion: config.kwargs_expansion || false,
   });
   wm.rpc = rpc;