chore: fix issues with openai-connector docker

basemind-ai · Nov 7, 2023 · 46e2190 · 46e2190
1 parent a89c6cf
commit 46e2190
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -95,7 +95,7 @@ services:
         build:
             dockerfile: docker/Dockerfile.ts-services
             context: .
-            target: install
+            # target: install
             args:
                 BUILD_TARGET: openai-connector
         ports:
@@ -110,7 +110,7 @@ services:
             GRPC_TRACE: channel,subchannel,call_stream
             SERVER_PORT: 8000
         working_dir: /app/services/openai-connector
-        command: ['pnpm', 'run', 'dev']
+        command: ['node', 'run', 'dev']
         env_file: '.secrets/.env.openai-connector'
     frontend:
         build:

diff --git a/docker/Dockerfile.ts-services b/docker/Dockerfile.ts-services
@@ -32,4 +32,4 @@ RUN pnpm install -r --prod
 
 WORKDIR /app/services/${BUILD_TARGET}/dist
 USER app
-CMD ["index.js"]
+CMD ["node", "main.js"]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/services/openai-connector/package.json b/services/openai-connector/package.json
@@ -14,6 +14,7 @@
 		"@grpc/grpc-js": "^1.9.9",
 		"@protobuf-ts/runtime": "^2.9.1",
 		"@protobuf-ts/runtime-rpc": "^2.9.1",
+		"grpc-health-check": "^2.0.0",
 		"openai": "^4.16.1",
 		"pino": "^8.16.1"
 	}

diff --git a/services/openai-connector/src/index.ts b/services/openai-connector/src/index.ts
@@ -3,11 +3,16 @@ import {
 	IOpenAIService,
 	openAIServiceDefinition,
 } from 'gen/openai/v1/openai.grpc-server';
+import { HealthImplementation } from 'grpc-health-check';
 import { createServer } from 'shared/grpc';
 import logger from 'shared/logger';
 
 import { openAIPrompt, openAIStream } from '@/handlers';
 
+const healthImpl = new HealthImplementation({
+	'': 'SERVING',
+});
+
 const port = process.env.SERVER_PORT ?? 50_051;
 
 const implementation = {
@@ -22,6 +27,8 @@ const server = createServer({
 	implementation,
 });
 
+healthImpl.addToServer(server);
+
 server.bindAsync(
 	`0.0.0.0:${port}`,
 	ServerCredentials.createInsecure(),

diff --git a/services/openai-connector/webpack.config.ts b/services/openai-connector/webpack.config.ts
@@ -22,7 +22,7 @@ const config: Configuration = {
 				exclude: [
 					(issue: Issue) => {
 						return !!issue.file?.includes(
-							'/app/node_modules/.pnpm/openai',
+							'/node_modules/.pnpm/openai',
 						);
 					},
 				],