cleanup: temporarily remove subtrace for new builds to work

devflowinc · Nov 25, 2024 · 0102754 · 0102754
1 parent 21c0d3e
commit 0102754
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 19 deletions.
diff --git a/clients/ts-sdk/openapi.json b/clients/ts-sdk/openapi.json
@@ -12,7 +12,7 @@
       "name": "BSL",
       "url": "https://github.com/devflowinc/trieve/blob/main/LICENSE.txt"
     },
-    "version": "0.12.1"
+    "version": "0.13.0"
   },
   "servers": [
     {
@@ -7569,9 +7569,6 @@
           },
           {
             "$ref": "#/components/schemas/ContentChunkMetadata"
-          },
-          {
-            "$ref": "#/components/schemas/QdrantChunkMetadata"
           }
         ]
       },
@@ -11359,9 +11356,6 @@
           },
           {
             "$ref": "#/components/schemas/ContentChunkMetadata"
-          },
-          {
-            "$ref": "#/components/schemas/QdrantChunkMetadata"
           }
         ]
       },
@@ -11851,14 +11845,20 @@
       "QdrantChunkMetadata": {
         "type": "object",
         "required": [
-          "qdrant_point_id"
+          "qdrant_point_id",
+          "dataset_id",
+          "weight"
         ],
         "properties": {
           "chunk_html": {
             "type": "string",
             "nullable": true
           },
-          "images_urls": {
+          "dataset_id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "image_urls": {
             "type": "array",
             "items": {
               "type": "string"
@@ -11869,9 +11869,22 @@
             "type": "string",
             "nullable": true
           },
+          "location": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/GeoInfo"
+              }
+            ],
+            "nullable": true
+          },
           "metadata": {
             "nullable": true
           },
+          "num_value": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
           "qdrant_point_id": {
             "type": "string",
             "format": "uuid"
@@ -11882,6 +11895,19 @@
               "type": "string"
             },
             "nullable": true
+          },
+          "time_stamp": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "tracking_id": {
+            "type": "string",
+            "nullable": true
+          },
+          "weight": {
+            "type": "number",
+            "format": "double"
           }
         }
       },

diff --git a/clients/ts-sdk/package.json b/clients/ts-sdk/package.json
@@ -6,7 +6,7 @@
   "files": [
     "dist"
   ],
-  "version": "0.0.33",
+  "version": "0.0.34",
   "license": "MIT",
   "scripts": {
     "lint": "eslint 'src/**/*.ts'",

diff --git a/clients/ts-sdk/src/types.gen.ts b/clients/ts-sdk/src/types.gen.ts
@@ -341,7 +341,7 @@ export type ChunkMetadataStringTagSet = {
     weight: number;
 };
 
-export type ChunkMetadataTypes = SlimChunkMetadata | ChunkMetadataStringTagSet | ContentChunkMetadata | QdrantChunkMetadata;
+export type ChunkMetadataTypes = SlimChunkMetadata | ChunkMetadataStringTagSet | ContentChunkMetadata;
 
 export type ChunkMetadataWithPosition = {
     chunk: ChunkMetadata;
@@ -1786,7 +1786,7 @@ export type MultiQuery = {
     weight: number;
 };
 
-export type NewChunkMetadataTypes = SlimChunkMetadataWithArrayTagSet | ChunkMetadata | ContentChunkMetadata | QdrantChunkMetadata;
+export type NewChunkMetadataTypes = SlimChunkMetadataWithArrayTagSet | ChunkMetadata | ContentChunkMetadata;
 
 export type Organization = {
     created_at: string;
@@ -1910,11 +1910,17 @@ export type PublicPageTheme = 'light' | 'dark';
 
 export type QdrantChunkMetadata = {
     chunk_html?: (string) | null;
-    images_urls?: Array<(string)> | null;
+    dataset_id: string;
+    image_urls?: Array<(string)> | null;
     link?: (string) | null;
+    location?: ((GeoInfo) | null);
     metadata?: unknown;
+    num_value?: (number) | null;
     qdrant_point_id: string;
     tag_set?: Array<(string)> | null;
+    time_stamp?: (string) | null;
+    tracking_id?: (string) | null;
+    weight: number;
 };
 
 /**

diff --git a/server/Dockerfile.ingestion-worker b/server/Dockerfile.ingestion-worker
@@ -32,10 +32,9 @@ RUN apt-get update -y; \
     redis-tools \
     ;
 
-RUN curl -fsSL https://github.com/subtrace/subtrace/releases/download/b134/subtrace-linux-amd64 -o /app/subtrace && chmod +x /app/subtrace
 COPY ./migrations/ /app/migrations
 COPY --from=builder /app/target/release/ingestion-worker /app/ingestion-worker
 
 
 EXPOSE 8090
-ENTRYPOINT ["/app/subtrace", "run", "--tls-false", "--", "/app/ingestion-worker"]
+ENTRYPOINT ["/app/ingestion-worker"]
diff --git a/server/Dockerfile.server b/server/Dockerfile.server
@@ -3,7 +3,7 @@ FROM rust:1.81-slim-bookworm AS chef
 # it will be cached from the second build onwards
 RUN apt-get update -y && apt-get -y install pkg-config libssl-dev libpq-dev g++ curl
 RUN cargo install cargo-chef 
-WORKDIR app
+WORKDIR /app
 
 FROM chef AS planner
 COPY . .
@@ -31,12 +31,10 @@ RUN apt-get update -y; \
     redis-tools \
     ;
 
-RUN curl -fsSL https://github.com/subtrace/subtrace/releases/download/b134/subtrace-linux-amd64 -o /app/subtrace && chmod +x /app/subtrace
-
 COPY ./migrations/ /app/migrations
 COPY ./ch_migrations /app/ch_migrations
 COPY ./src/public/ /app/src/public
 COPY --from=builder /app/target/release/trieve-server /app/trieve-server
 
 EXPOSE 8090
-ENTRYPOINT ["/app/subtrace", "run", "--tls-false", "--", "/app/trieve-server"]
+ENTRYPOINT ["/app/trieve-server"]