hypha-rpc 0.20.11 → 0.20.13

package/index.d.ts

@@ -82,10 +82,12 @@ declare module "hypha-rpc" {
       API_VERSION: string;
       VERSION: string;
       schemaFunction: (func: Function, annotation: FunctionAnnotation ) => Function;
+      loadRequirements: (config: any) => Promise<any>;
       login: (config: LoginConfig) => Promise<any>;
       connectToServer: (config: ServerConfig) => Promise<any>;
       registerRTCService: (server: any, service_id: string, config?: any) => Promise<any>;
       getRTCService: (server: any, service_id: string, config?: any) => Promise<any>;
+      setupLocalClient: (enable_execution: boolean, on_ready?: Function) => Promise<any>;
     };
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypha-rpc",
-  "version": "0.20.11",
+  "version": "0.20.13",
   "description": "Hypha RPC client for connecting to Hypha server for data management and AI model serving.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/rpc.js

@@ -685,12 +685,13 @@ export class RPC extends MessageEmitter {
 
   _extract_service_info(service) {
     const config = service.config || {};
-    config.workspace = config.workspace || self._local_workspace;
+    config.workspace =
+      config.workspace || this._local_workspace || this._connection.workspace;
     const skipContext = config.require_context;
     const serviceSchema = _get_schema(service, null, skipContext);
     const serviceInfo = {
       config: config,
-      id: `${this._client_id}:${service["id"]}`,
+      id: `${config.workspace}/${this._client_id}:${service["id"]}`,
       name: service.name || service["id"],
       description: service.description || "",
       type: service.type || "generic",

package/src/websocket-client.js

@@ -1,9 +1,10 @@
 import { RPC, API_VERSION } from "./rpc.js";
-import { assert, randId, waitFor } from "./utils";
+import { assert, randId, waitFor, loadRequirements } from "./utils";
 import { schemaFunction } from "./utils/schema.js";
 import { getRTCService, registerRTCService } from "./webrtc-client.js";
 
 export { RPC, API_VERSION, schemaFunction };
+export { loadRequirements };
 export { getRTCService, registerRTCService };
 
 const MAX_RETRY = 1000000;
@@ -618,7 +619,7 @@ export async function connectToServer(config) {
   return wm;
 }
 
-class LocalWebSocket {
+export class LocalWebSocket {
   constructor(url, client_id, workspace) {
     this.url = url;
     this.onopen = () => {};

package/tests/websocket_client_test.js

@@ -173,7 +173,9 @@ describe("RPC", async () => {
       server_url: SERVER_URL,
       client_id: "test-plugin-1",
     });
-    await server.registerService(plugin_interface);
+    const info = await server.registerService(plugin_interface);
+    expect(info.id).to.contain("/");
+    expect(info.id).to.contain(":");
     const api = await server.rpc.get_remote_service("default");
 
     const msg = "this is an messge.";