pi-llama-cpp 0.11.0 → 0.13.0

package/tests/serverManager.test.ts

@@ -27,7 +27,7 @@ const mockPi = {
  * `settings.resolveServers()` — the same path a real scan takes.
  */
 const createManager = async (...servers: Server[]): Promise<ServerManager> => {
-  vi.mocked(settingsStub.resolveServers).mockReturnValue(servers);
+  vi.mocked(settingsStub.resolveServers).mockResolvedValue(servers);
   const manager = new ServerManager(settingsStub);
   await manager.update(mockPi as any);
   return manager;
@@ -45,40 +45,6 @@ beforeEach(() => {
   });
 });
 
-describe("Server", () => {
-  it("should generate provider IDs from URLs", () => {
-    const server1 = new Server(settingsStub, {
-      baseUrl: "http://127.0.0.1:8080",
-    });
-    expect(server1.providerId).toBe("llama-server=http://127.0.0.1:8080");
-    const server2 = new Server(settingsStub, {
-      baseUrl: "http://10.0.0.5:8080",
-    });
-    expect(server2.providerId).toBe("llama-server=http://10.0.0.5:8080");
-    const server3 = new Server(settingsStub, { baseUrl: "http://127.0.0.1" });
-    expect(server3.providerId).toBe("llama-server=http://127.0.0.1");
-    const server4 = new Server(settingsStub, {
-      baseUrl: "http://127.0.0.1:80",
-    });
-    expect(server4.providerId).toBe("llama-server=http://127.0.0.1:80");
-    const server5 = new Server(settingsStub, {
-      baseUrl: "https://127.0.0.1:443",
-    });
-    expect(server5.providerId).toBe("llama-server=https://127.0.0.1:443");
-  });
-
-  it("should generate provider names from URLs", () => {
-    const server1 = new Server(settingsStub, {
-      baseUrl: "http://127.0.0.1:8080",
-    });
-    expect(server1.providerName).toBe("Llama.cpp (http://127.0.0.1:8080)");
-    const server2 = new Server(settingsStub, {
-      baseUrl: "http://10.0.0.5:8080",
-    });
-    expect(server2.providerName).toBe("Llama.cpp (http://10.0.0.5:8080)");
-  });
-});
-
 describe("ServerManager", () => {
   it("should register providers for all servers", async () => {
     const mockModel = {
@@ -103,7 +69,7 @@ describe("ServerManager", () => {
       "llama-server=http://127.0.0.1:8080",
       {
         name: "Llama.cpp (http://127.0.0.1:8080)",
-        baseUrl: "http://127.0.0.1:8080",
+        baseUrl: "http://127.0.0.1:8080/v1",
         api: "openai-completions",
         apiKey: "key-1",
         models: [{ id: "test-model" }],
@@ -113,7 +79,7 @@ describe("ServerManager", () => {
       "llama-server=http://127.0.0.1:8081",
       {
         name: "Llama.cpp (http://127.0.0.1:8081)",
-        baseUrl: "http://127.0.0.1:8081",
+        baseUrl: "http://127.0.0.1:8081/v1",
         api: "openai-completions",
         apiKey: "key-2",
         models: [{ id: "test-model" }],
@@ -134,7 +100,7 @@ describe("ServerManager", () => {
     });
     const manager = await createManager(server1, server2);
 
-    const allModels = manager.getAllModels();
+    const allModels = await manager.getAllModels();
 
     expect(allModels).toHaveLength(2);
     expect(allModels[0]).toBe(mockModel1);
@@ -153,13 +119,13 @@ describe("ServerManager", () => {
 
     it("should register servers added after the first scan", async () => {
       const server1 = makeServer("http://127.0.0.1:8080", "model-1");
-      vi.mocked(settingsStub.resolveServers).mockReturnValue([server1]);
+      vi.mocked(settingsStub.resolveServers).mockResolvedValue([server1]);
       const manager = new ServerManager(settingsStub);
       await manager.update(mockPi as any);
       expect(manager.servers).toHaveLength(1);
 
       const server2 = makeServer("http://127.0.0.1:8081", "model-2");
-      vi.mocked(settingsStub.resolveServers).mockReturnValue([
+      vi.mocked(settingsStub.resolveServers).mockResolvedValue([
         server1,
         server2,
       ]);
@@ -167,13 +133,11 @@ describe("ServerManager", () => {
 
       expect(mockPi.registerProvider).toHaveBeenCalledWith(
         "llama-server=http://127.0.0.1:8081",
-        expect.objectContaining({ baseUrl: "http://127.0.0.1:8081" }),
+        expect.objectContaining({ baseUrl: "http://127.0.0.1:8081/v1" }),
       );
       expect(manager.servers).toHaveLength(2);
-      expect(manager.getAllModels().map((m) => m.id)).toEqual([
-        "model-1",
-        "model-2",
-      ]);
+      const models = await manager.getAllModels();
+      expect(models.map((m) => m.id)).toEqual(["model-1", "model-2"]);
     });
 
     it("should unregister and disconnect removed servers on the next scan", async () => {
@@ -190,7 +154,7 @@ describe("ServerManager", () => {
       const manager = await createManager(server1, server2);
       expect(manager.servers).toHaveLength(2);
 
-      vi.mocked(settingsStub.resolveServers).mockReturnValue([server1]);
+      vi.mocked(settingsStub.resolveServers).mockResolvedValue([server1]);
       await manager.update(mockPi as any);
 
       expect(mockPi.unregisterProvider).toHaveBeenCalledTimes(1);
@@ -200,7 +164,9 @@ describe("ServerManager", () => {
       expect(disconnectRemoved).toHaveBeenCalledTimes(1);
       // Surviving providers keep their SSE manager connected (today's behavior)
       expect(disconnectKept).not.toHaveBeenCalled();
-      expect(manager.getAllModels().map((m) => m.id)).toEqual(["model-1"]);
+      expect((await manager.getAllModels()).map((m) => m.id)).toEqual([
+        "model-1",
+      ]);
     });
 
     it("should unregister the old provider when a server URL changes", async () => {
@@ -208,7 +174,7 @@ describe("ServerManager", () => {
         makeServer("http://127.0.0.1:8080", "model-1"),
       );
 
-      vi.mocked(settingsStub.resolveServers).mockReturnValue([
+      vi.mocked(settingsStub.resolveServers).mockResolvedValue([
         makeServer("http://127.0.0.1:9090", "model-1"),
       ]);
       await manager.update(mockPi as any);
@@ -218,7 +184,7 @@ describe("ServerManager", () => {
       );
       expect(mockPi.registerProvider).toHaveBeenCalledWith(
         "llama-server=http://127.0.0.1:9090",
-        expect.objectContaining({ baseUrl: "http://127.0.0.1:9090" }),
+        expect.objectContaining({ baseUrl: "http://127.0.0.1:9090/v1" }),
       );
       expect(manager.servers[0]?.providerId).toBe(
         "llama-server=http://127.0.0.1:9090",
@@ -238,7 +204,7 @@ describe("ServerManager", () => {
         customId: "my-custom-id",
         customName: "B",
       });
-      vi.mocked(settingsStub.resolveServers).mockReturnValue([renamed]);
+      vi.mocked(settingsStub.resolveServers).mockResolvedValue([renamed]);
       await manager.update(mockPi as any);
 
       expect(mockPi.unregisterProvider).not.toHaveBeenCalled();
@@ -256,7 +222,7 @@ describe("ServerManager", () => {
 
       expect(manager.servers).toHaveLength(1);
       expect(mockPi.registerProvider).toHaveBeenCalledTimes(1);
-      expect(manager.getAllModels()).toHaveLength(1);
+      expect(await manager.getAllModels()).toHaveLength(1);
     });
 
     it("should return undefined from getServer for a removed server's model", async () => {
@@ -264,7 +230,7 @@ describe("ServerManager", () => {
         makeServer("http://127.0.0.1:8080", "model-1"),
       );
 
-      const live = manager.getAllModels()[0];
+      const live = (await manager.getAllModels())[0];
       expect(manager.getServer(live)).toBe(manager.servers[0]);
 
       const orphan = { serverUrl: "http://gone:1" } as unknown as BaseModel;
@@ -276,7 +242,7 @@ describe("ServerManager", () => {
     const sortBy = () => vi.mocked(settingsStub.resolveSortBy);
 
     it("should return models in API order when sortBy is 'api'", async () => {
-      sortBy().mockReturnValue("api");
+      sortBy().mockResolvedValue("api");
 
       const mockModelA = createMockModel("model-a");
       const mockModelZ = createMockModel("model-z");
@@ -287,7 +253,7 @@ describe("ServerManager", () => {
         }),
       );
 
-      const allModels = manager.getAllModels();
+      const allModels = await manager.getAllModels();
 
       expect(allModels).toHaveLength(2);
       expect(allModels[0]).toBe(mockModelA);
@@ -295,7 +261,7 @@ describe("ServerManager", () => {
     });
 
     it("should sort models by ID ascending when sortBy is 'asc'", async () => {
-      sortBy().mockReturnValue("asc");
+      sortBy().mockResolvedValue("asc");
 
       const mockModelZ = createMockModel("model-z");
       const mockModelA = createMockModel("model-a");
@@ -306,7 +272,7 @@ describe("ServerManager", () => {
         }),
       );
 
-      const allModels = manager.getAllModels();
+      const allModels = await manager.getAllModels();
 
       expect(allModels).toHaveLength(2);
       expect(allModels[0]).toBe(mockModelA);
@@ -314,7 +280,7 @@ describe("ServerManager", () => {
     });
 
     it("should sort models by ID descending when sortBy is 'desc'", async () => {
-      sortBy().mockReturnValue("desc");
+      sortBy().mockResolvedValue("desc");
 
       const mockModelA = createMockModel("model-a");
       const mockModelZ = createMockModel("model-z");
@@ -325,7 +291,7 @@ describe("ServerManager", () => {
         }),
       );
 
-      const allModels = manager.getAllModels();
+      const allModels = await manager.getAllModels();
 
       expect(allModels).toHaveLength(2);
       expect(allModels[0]).toBe(mockModelZ);
@@ -333,7 +299,7 @@ describe("ServerManager", () => {
     });
 
     it("should sort models by name ascending when sortBy is 'asc-name'", async () => {
-      sortBy().mockReturnValue("asc-name");
+      sortBy().mockResolvedValue("asc-name");
 
       const mockModelB = createMockModel("zebra", { id: "model-b" });
       const mockModelA = createMockModel("alpha", { id: "model-a" });
@@ -344,7 +310,7 @@ describe("ServerManager", () => {
         }),
       );
 
-      const allModels = manager.getAllModels();
+      const allModels = await manager.getAllModels();
 
       expect(allModels).toHaveLength(2);
       expect(allModels[0]).toBe(mockModelA);
@@ -352,7 +318,7 @@ describe("ServerManager", () => {
     });
 
     it("should sort models by name descending when sortBy is 'desc-name'", async () => {
-      sortBy().mockReturnValue("desc-name");
+      sortBy().mockResolvedValue("desc-name");
 
       const mockModelA = createMockModel("alpha", { id: "model-a" });
       const mockModelB = createMockModel("zebra", { id: "model-b" });
@@ -363,7 +329,7 @@ describe("ServerManager", () => {
         }),
       );
 
-      const allModels = manager.getAllModels();
+      const allModels = await manager.getAllModels();
 
       expect(allModels).toHaveLength(2);
       expect(allModels[0]).toBe(mockModelB);