feat: github action for PR

CapgeminiInventUK · Feb 4, 2024 · d5f5880 · d5f5880
1 parent a0e583c
commit d5f5880
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 19 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -0,0 +1,25 @@
+name: Node.js CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        project: [ui, server]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: npm install
+        working-directory: ${{ matrix.project }}
+      - name: Run lint
+        run: npm run lint
+        working-directory: ${{ matrix.project }}
+      - name: Build
+        run: npm run build
+        working-directory: ${{ matrix.project }}
diff --git a/server/src/repositories/ingest-repository.ts b/server/src/repositories/ingest-repository.ts
@@ -48,6 +48,4 @@ export class IngestRepository {
     return await collection.updateOne({ 'feedback.id': feedbackId },
       { $set: setOperation });
   }
-
-
 }
diff --git a/server/src/services/langchain-to-langtrace-service.ts b/server/src/services/langchain-to-langtrace-service.ts
@@ -31,10 +31,10 @@ export class LangchainToLangtraceService {
     return langchainData.run_id;
   }
 
-  async updateTrace(trace_id: string, langchainData: TraceData): Promise<boolean> {
+  async updateTrace(traceId: string, langchainData: TraceData): Promise<boolean> {
     this.convertToDates(langchainData);
 
-    const updateResult = await this.repository.updateTrace(trace_id, langchainData);
+    const updateResult = await this.repository.updateTrace(traceId, langchainData);
     return updateResult.matchedCount > 0;
   }
 

diff --git a/server/src/services/trace-service.test.ts b/server/src/services/trace-service.test.ts
@@ -10,6 +10,8 @@ describe('TraceService', () => {
   let service: TraceService;
   let mockRepository: jest.Mocked<ApiRepository>;
 
+  const mockProjectId = 'projectId';
+
   beforeEach(() => {
     mockRepository = new ApiRepository() as any;
     service = new TraceService();
@@ -26,7 +28,12 @@ describe('TraceService', () => {
     run_type: '',
     session_name: '',
     start_time: '',
-    'run_id': mockTraceId, name: 'Test Trace'
+    'run_id': mockTraceId,
+    name: 'Test Trace',
+    execution_order: 0,
+    trace_id: null,
+    dotted_order: null,
+
   };
 
 
@@ -42,17 +49,26 @@ describe('TraceService', () => {
       mockRepository.getTraces.mockResolvedValue(expectedResult);
 
       mockRepository.getFeedbackCounts.mockResolvedValue(
-        [{ key: 'useful', counts: { 'true': 0, 'false': 0 } }]);
+        [{
+          key: 'useful',
+          feedbackType: 'value',
+          counts: { 'true': 0, 'false': 0 }
+        }]
+      );
 
-      mockRepository.getLatencyPercentile.mockResolvedValue( [
+      mockRepository.getLatencyPercentile.mockResolvedValue([
           { percentile: 0, latency: 0 } as TracePercentile,
       ]
       );
 
-      const result = await service.getTopLevelTraces();
+      const result = await service.getTopLevelTraces(mockProjectId);
 
       expect(result).toEqual({
-        feedback_counts: [{ key: 'useful', counts: { 'true': 0, 'false': 0 } }],
+        feedback_counts: [{
+          key: 'useful',
+          feedbackType: 'value',
+          counts: { 'true': 0, 'false': 0 }
+        }],
         latency_percentiles: [{ percentile: 0, latency: 0 }],
         traces: expectedResult
       } satisfies TracesResponse);
@@ -66,30 +82,28 @@ describe('TraceService', () => {
     it('should return null if no trace is found', async () => {
       mockRepository.getTraceTreeById.mockResolvedValue([]);
 
-      const result = await service.getTraceTreeByRunId(mockTraceId);
+      const result = await service.getTraceTreeByRunId(mockProjectId, mockTraceId);
 
       expect(result).toBeNull();
-      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockTraceId);
+      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockProjectId, mockTraceId);
     });
 
     it('should throw an error if multiple traces are found', async () => {
       mockRepository.getTraceTreeById.mockResolvedValue([mockTraceDocument, mockTraceDocument]);
 
-      await expect(service.getTraceTreeByRunId(mockTraceId)).rejects.toThrow('Trace not found');
-      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockTraceId);
+      await expect(service.getTraceTreeByRunId(mockProjectId, mockTraceId))
+        .rejects.toThrow('Trace not found');
+      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockProjectId, mockTraceId);
     });
 
     it('should return a trace document if exactly one trace is found', async () => {
 
       mockRepository.getTraceTreeById.mockResolvedValue([mockTraceDocument]);
 
-      const result = await service.getTraceTreeByRunId(mockTraceId);
+      const result = await service.getTraceTreeByRunId(mockProjectId, mockTraceId);
 
       expect(result).toEqual(mockTraceDocument);
-      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockTraceId);
+      expect(mockRepository.getTraceTreeById).toHaveBeenCalledWith(mockProjectId, mockTraceId);
     });
   });
-
-
-})
-;
+});