Merge branch 'main' into feat/analytics_2

openchatai · Jan 23, 2024 · b3729b3 · b3729b3
2 parents a1fe46d + 91f5ac8
commit b3729b3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/copilot-widget/package.json b/copilot-widget/package.json
@@ -50,7 +50,7 @@
     "tailwindcss-animate": "^1.0.6",
     "timeago.js": "^4.0.2",
     "typescript": "^5.0.2",
-    "vite": "^4.4.12",
+    "vite": "^4.5.2",
     "vite-plugin-dts": "^3.6.4",
     "vite-tsconfig-paths": "^4.2.1"
   },

diff --git a/copilot-widget/pnpm-lock.yaml b/copilot-widget/pnpm-lock.yaml
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
@@ -17,8 +17,7 @@ COPY package.json pnpm-lock.yaml* ./
 
 # Install dependencies
 # This layer will be cached unless package.json or pnpm-lock.yaml changes
-RUN pnpm i --frozen-lockfile
-
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 # Builder image
 FROM base AS builder
 

diff --git a/dashboard/app/(copilot)/copilot/[copilot_id]/conversations/_parts/ChatScreen.tsx b/dashboard/app/(copilot)/copilot/[copilot_id]/conversations/_parts/ChatScreen.tsx
@@ -40,14 +40,17 @@ function CopilotMessage({ message, created_at, debug_json }: ChatMessageType) {
         </div>
         <div className="flex items-center justify-between w-full gap-5">
           <span className="text-xs">{format(created_at)}</span>
-          <Popover>
-            <PopoverTrigger className="self-center">
-              <AlertCircle className="size-5" />
-            </PopoverTrigger>
-            <PopoverContent side="right" align="center" className="w-fit max-w-sm p-0 overflow-hidden">
-              <BaseCodeBlock code={JSON.stringify(debug_json) || "{}"} language="javascript" />
-            </PopoverContent>
-          </Popover>
+          {
+            debug_json &&
+            <Popover>
+              <PopoverTrigger className="self-center">
+                <AlertCircle className="size-5" />
+              </PopoverTrigger>
+              <PopoverContent side="right" align="center" className="w-fit max-w-sm p-0 overflow-hidden">
+                <BaseCodeBlock code={JSON.stringify(debug_json) || "{}"} language="javascript" />
+              </PopoverContent>
+            </Popover>
+          }
         </div>
       </div>
 

diff --git a/llm-server/requirements.txt b/llm-server/requirements.txt
@@ -1,7 +1,7 @@
 aiofiles==23.2.1
 aiohttp==3.9.1
 aiosignal==1.3.1
-alembic==1.12.1
+alembic==1.13.1
 amqp==5.1.1
 annotated-types==0.6.0
 anyio==3.7.1