chore(tsconfig): enabling strictNullChecks (#812)

* chore(tsconfig): enabling strictNullChecks Signed-off-by: axel7083 <[email protected]> * fix: formatting Signed-off-by: axel7083 <[email protected]> * fix: tests Signed-off-by: axel7083 <[email protected]> * fix: tests Signed-off-by: axel7083 <[email protected]> * Apply suggestions from code review Signed-off-by: axel7083 <[email protected]> * Update packages/backend/src/studio.ts Signed-off-by: axel7083 <[email protected]> * fix: prettier Signed-off-by: axel7083 <[email protected]> --------- Signed-off-by: axel7083 <[email protected]>
containers · Apr 22, 2024 · 529bc5b · 529bc5b
1 parent 17f214b
commit 529bc5b
Show file tree

Hide file tree

Showing 33 changed files with 205 additions and 138 deletions.
diff --git a/packages/backend/src/managers/GPUManager.spec.ts b/packages/backend/src/managers/GPUManager.spec.ts
@@ -51,7 +51,7 @@ const webviewMock = {
 
 beforeEach(() => {
   vi.resetAllMocks();
-  vi.mocked(webviewMock.postMessage).mockResolvedValue(undefined);
+  vi.mocked(webviewMock.postMessage).mockResolvedValue(true);
 
   vi.mocked(getProviderContainerConnection).mockReturnValue({
     providerId: 'dummyProviderId',

diff --git a/packages/backend/src/managers/SnippetManager.spec.ts b/packages/backend/src/managers/SnippetManager.spec.ts
@@ -32,7 +32,7 @@ const telemetryMock = {
 
 beforeEach(() => {
   vi.resetAllMocks();
-  vi.mocked(webviewMock.postMessage).mockResolvedValue(undefined);
+  vi.mocked(webviewMock.postMessage).mockResolvedValue(true);
 });
 
 test('expect init to notify webview', () => {
@@ -59,9 +59,9 @@ test('expect postman-code-generators to have nodejs supported.', () => {
   const languages = manager.getLanguageList();
   const nodejs = languages.find(language => language.key === 'nodejs');
   expect(nodejs).toBeDefined();
-  expect(nodejs.variants.length).toBeGreaterThan(0);
+  expect(nodejs?.variants.length).toBeGreaterThan(0);
 
-  const native = nodejs.variants.find(variant => variant.key === 'Request');
+  const native = nodejs?.variants.find(variant => variant.key === 'Request');
   expect(native).toBeDefined();
 });
 
@@ -97,9 +97,9 @@ test('expect snippet manager to have Quarkus Langchain4J supported.', () => {
   const languages = manager.getLanguageList();
   const java = languages.find(language => language.key === 'java');
   expect(java).toBeDefined();
-  expect(java.variants.length).toBeGreaterThan(0);
+  expect(java?.variants.length).toBeGreaterThan(0);
 
-  const quarkus_langchain4j = java.variants.find(variant => variant.key === 'Quarkus Langchain4J');
+  const quarkus_langchain4j = java?.variants.find(variant => variant.key === 'Quarkus Langchain4J');
   expect(quarkus_langchain4j).toBeDefined();
 });
 
@@ -110,12 +110,14 @@ test('expect new variant to replace existing one if same name', () => {
   const languages = manager.getLanguageList();
   const java = languages.find(language => language.key === 'java');
   expect(java).toBeDefined();
-  expect(java.variants.length).toBeGreaterThan(0);
+  expect(java?.variants.length).toBeGreaterThan(0);
+
+  if (!java) throw new Error('undefined java');
 
   const oldVariantsNumber = java.variants.length;
   manager.addVariant('java', java.variants[0].key, vi.fn());
   const languages_updated = manager.getLanguageList();
   const java_updated = languages_updated.find(language => language.key === 'java');
   expect(java_updated).toBeDefined();
-  expect(java_updated.variants.length).equals(oldVariantsNumber);
+  expect(java_updated?.variants.length).equals(oldVariantsNumber);
 });
diff --git a/packages/backend/src/managers/SnippetManager.ts b/packages/backend/src/managers/SnippetManager.ts
@@ -62,10 +62,12 @@ export class SnippetManager extends Publisher<Language[]> implements Disposable
 
     return new Promise((resolve, reject) => {
       const request = new Request(requestOptions);
-      convert(language, variant, request, {}, (error: unknown, snippet: string) => {
+      convert(language, variant, request, {}, (error: unknown, snippet: string | undefined) => {
         if (error) {
           reject(error);
           return;
+        } else if (snippet === undefined) {
+          throw new Error('undefined snippet');
         }
         resolve(snippet);
       });

diff --git a/packages/backend/src/managers/applicationManager.spec.ts b/packages/backend/src/managers/applicationManager.spec.ts
@@ -286,7 +286,7 @@ describe('pullApplication', () => {
       license: '',
       name: 'Model 1',
       registry: '',
-      url: '',
+      url: 'dummy-url',
       memory: 1000,
     };
     mocks.inspectContainerMock.mockResolvedValue({

diff --git a/packages/backend/src/managers/applicationManager.ts b/packages/backend/src/managers/applicationManager.ts
@@ -20,14 +20,15 @@ import type { Recipe } from '@shared/src/models/IRecipe';
 import type { GitCloneInfo, GitManager } from './gitManager';
 import fs from 'fs';
 import * as path from 'node:path';
-import {
-  type PodCreatePortOptions,
-  containerEngine,
-  type TelemetryLogger,
-  type PodInfo,
-  type Webview,
-  type HostConfig,
-  Disposable,
+import { containerEngine, Disposable } from '@podman-desktop/api';
+import type {
+  BuildImageOptions,
+  PodCreatePortOptions,
+  TelemetryLogger,
+  PodInfo,
+  Webview,
+  HostConfig,
+  HealthConfig,
 } from '@podman-desktop/api';
 import type { AIConfig, AIConfigFile, ContainerConfig } from '../models/AIConfig';
 import { parseYamlFile } from '../models/AIConfig';
@@ -240,7 +241,10 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     let podInfo: ApplicationPodInfo;
     try {
       podInfo = await this.createPod(recipe, model, images);
-      task.labels['pod-id'] = podInfo.Id;
+      task.labels = {
+        ...task.labels,
+        'pod-id': podInfo.Id,
+      };
     } catch (e) {
       console.error('error when creating pod', e);
       task.state = 'error';
@@ -278,9 +282,9 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     const isQEMUVM = await isQEMUMachine();
     await Promise.all(
       images.map(async image => {
-        let hostConfig: HostConfig;
+        let hostConfig: HostConfig | undefined = undefined;
         let envs: string[] = [];
-        let healthcheck: unknown | undefined = undefined;
+        let healthcheck: HealthConfig | undefined = undefined;
         // if it's a model service we mount the model as a volume
         if (image.modelService) {
           const modelName = path.basename(modelPath);
@@ -348,13 +352,15 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     for (const image of images) {
       for (const exposed of image.ports) {
         const localPorts = await getPortsInfo(exposed);
-        portmappings.push({
-          container_port: parseInt(exposed),
-          host_port: parseInt(localPorts),
-          host_ip: '',
-          protocol: '',
-          range: 1,
-        });
+        if (localPorts) {
+          portmappings.push({
+            container_port: parseInt(exposed),
+            host_port: parseInt(localPorts),
+            host_ip: '',
+            protocol: '',
+            range: 1,
+          });
+        }
       }
     }
 
@@ -425,11 +431,11 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
         }
 
         const imageTag = this.getImageTag(recipe, container);
-        const buildOptions = {
+        const buildOptions: BuildImageOptions = {
           containerFile: container.containerfile,
           tag: imageTag,
           labels: {
-            [LABEL_RECIPE_ID]: labels !== undefined && 'recipe-id' in labels ? labels['recipe-id'] : undefined,
+            [LABEL_RECIPE_ID]: labels !== undefined && 'recipe-id' in labels ? labels['recipe-id'] : '',
           },
         };
 
@@ -495,7 +501,7 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
   }
 
   getConfigAndFilterContainers(
-    recipeBaseDir: string,
+    recipeBaseDir: string | undefined,
     localFolder: string,
     labels?: { [key: string]: string },
   ): AIContainers {
@@ -537,7 +543,7 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     );
   }
 
-  getConfiguration(recipeBaseDir: string, localFolder: string): AIConfigFile {
+  getConfiguration(recipeBaseDir: string | undefined, localFolder: string): AIConfigFile {
     let configFile: string;
     if (recipeBaseDir !== undefined) {
       configFile = path.join(localFolder, recipeBaseDir, CONFIG_FILENAME);
@@ -745,7 +751,7 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
         // a fresh pod could not have been added yet, we will handle it at next iteration
         continue;
       }
-      const containerStates = await Promise.all(
+      const containerStates: (string | undefined)[] = await Promise.all(
         pod.Containers.map(container =>
           containerEngine.inspectContainer(pod.engineId, container.Id).then(data => data.State.Health?.Status),
         ),
@@ -768,7 +774,7 @@ export class ApplicationManager extends Publisher<ApplicationState[]> implements
     }
   }
 
-  getPodHealth(infos: string[]): PodHealth {
+  getPodHealth(infos: (string | undefined)[]): PodHealth {
     const checked = infos.filter(info => !!info && info !== 'none' && info !== '');
     if (!checked.length) {
       return 'none';

diff --git a/packages/backend/src/managers/catalogManager.ts b/packages/backend/src/managers/catalogManager.ts
@@ -70,7 +70,7 @@ export class CatalogManager extends Publisher<ApplicationCatalog> implements Dis
   }
 
   private loadDefaultCatalog(): void {
-    this.catalog = defaultCatalog;
+    this.catalog = defaultCatalog as ApplicationCatalog;
     this.notify();
   }
 
@@ -82,7 +82,10 @@ export class CatalogManager extends Publisher<ApplicationCatalog> implements Dis
 
     const sanitize = this.sanitize(content);
     this.catalog = {
-      models: [...defaultCatalog.models.filter(a => !sanitize.models.some(b => a.id === b.id)), ...sanitize.models],
+      models: [
+        ...defaultCatalog.models.filter(a => !sanitize.models.some(b => a.id === b.id)),
+        ...sanitize.models,
+      ] as ModelInfo[],
       recipes: [...defaultCatalog.recipes.filter(a => !sanitize.recipes.some(b => a.id === b.id)), ...sanitize.recipes],
       categories: [
         ...defaultCatalog.categories.filter(a => !sanitize.categories.some(b => a.id === b.id)),

diff --git a/packages/backend/src/managers/gitManager.ts b/packages/backend/src/managers/gitManager.ts
@@ -275,6 +275,9 @@ export class GitManager {
     while (remoteCommits.length && localCommits.length) {
       const remote = remoteCommits.pop();
       const local = localCommits.pop();
+      if (!remote || !local) {
+        break;
+      }
       if (remote === local) {
         continue;
       }

diff --git a/packages/backend/src/managers/inference/inferenceManager.spec.ts b/packages/backend/src/managers/inference/inferenceManager.spec.ts
@@ -111,7 +111,7 @@ beforeEach(() => {
   vi.resetAllMocks();
   // Default listContainers is empty
   mockListContainers([]);
-  vi.mocked(webviewMock.postMessage).mockResolvedValue(undefined);
+  vi.mocked(webviewMock.postMessage).mockResolvedValue(true);
   vi.mocked(containerEngine.inspectContainer).mockResolvedValue({
     State: {
       Status: 'running',
@@ -565,7 +565,7 @@ describe('containerRegistry events', () => {
     const listener = await deferred;
 
     const server = inferenceManager.get('dummyId');
-    expect(server.status).toBe('running');
+    expect(server?.status).toBe('running');
     expect(containerEngine.inspectContainer).toHaveBeenCalledOnce();
 
     vi.mocked(containerEngine.inspectContainer).mockResolvedValue({
@@ -578,7 +578,7 @@ describe('containerRegistry events', () => {
     listener('die');
 
     await vi.waitFor(() => {
-      expect(inferenceManager.get('dummyId').status).toBe('stopped');
+      expect(inferenceManager.get('dummyId')?.status).toBe('stopped');
       expect(containerEngine.inspectContainer).toHaveBeenCalledTimes(2);
     });
 
@@ -611,7 +611,7 @@ describe('containerRegistry events', () => {
     const listener = await deferred;
 
     const server = inferenceManager.get('dummyId');
-    expect(server.status).toBe('running');
+    expect(server?.status).toBe('running');
 
     listener('remove');
 

diff --git a/packages/backend/src/managers/inference/inferenceManager.ts b/packages/backend/src/managers/inference/inferenceManager.ts
@@ -417,10 +417,10 @@ export class InferenceManager extends Publisher<InferenceServer[]> implements Di
    * @param containerId the id of the container running the Inference Server
    */
   async deleteInferenceServer(containerId: string): Promise<void> {
-    if (!this.#servers.has(containerId)) {
+    const server = this.#servers.get(containerId);
+    if (!server) {
       throw new Error(`cannot find a corresponding server for container id ${containerId}.`);
     }
-    const server = this.#servers.get(containerId);
 
     try {
       // If the server is running we need to stop it.
@@ -469,7 +469,7 @@ export class InferenceManager extends Publisher<InferenceServer[]> implements Di
    * Stop an inference server from the container id
    * @param containerId the identifier of the container to stop
    */
-  async stopInferenceServer(containerId?: string): Promise<void> {
+  async stopInferenceServer(containerId: string): Promise<void> {
     if (!this.isInitialize()) throw new Error('Cannot stop the inference server.');
 
     const server = this.#servers.get(containerId);

diff --git a/packages/backend/src/managers/modelsManager.spec.ts b/packages/backend/src/managers/modelsManager.spec.ts
@@ -21,7 +21,8 @@ import os from 'os';
 import fs, { type Stats, type PathLike } from 'node:fs';
 import path from 'node:path';
 import { ModelsManager } from './modelsManager';
-import { type TelemetryLogger, type Webview, env, process as coreProcess } from '@podman-desktop/api';
+import { env, process as coreProcess } from '@podman-desktop/api';
+import type { RunResult, TelemetryLogger, Webview } from '@podman-desktop/api';
 import type { CatalogManager } from './catalogManager';
 import type { ModelInfo } from '@shared/src/models/IModelInfo';
 import * as utils from '../utils/utils';
@@ -536,7 +537,7 @@ describe('deleting models', () => {
 
   test('deleting on windows should check if models is uploaded', async () => {
     vi.mocked(env).isWindows = true;
-    vi.mocked(coreProcess.exec).mockResolvedValue(undefined);
+    vi.mocked(coreProcess.exec).mockResolvedValue({} as unknown as RunResult);
     mocks.getFirstRunningMachineNameMock.mockReturnValue('dummyMachine');
     mocks.getPodmanCliMock.mockReturnValue('dummyCli');