feat: expand item types and improve API response handling

.github/workflows/generate-client.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 9.9.0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/playwright.yml

@@ -48,9 +48,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install pnpm
-      uses: pnpm/action-setup@v2
+      uses: pnpm/action-setup@v3
       with:
-        version: 8
+        version: 9.9.0
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*

admin/src/client/index.ts

@@ -4,5 +4,3 @@ export { CancelablePromise, CancelError } from "./core/CancelablePromise"
 export { OpenAPI, type OpenAPIConfig } from "./core/OpenAPI"
 export * from "./sdk.gen"
 export * from "./types.gen"
-export { isApiResponse, extractApiResponseError } from "./utils"
-export { type ItemPublic } from "./types"

admin/src/client/types.ts

@@ -6,7 +6,33 @@
  * 项目的公共接口定义
  */
 export interface ItemPublic {
-  id: string;
-  title: string;
-  description?: string | null;
-} 
+  id: string
+  title: string
+  description?: string | null
+}
+
+/**
+ * 项目集合的公共接口定义
+ */
+export interface ItemsPublic {
+  data: Array<ItemPublic>
+  count: number
+}
+
+/**
+ * 从API响应中提取Item数据的类型
+ */
+export type ItemResponse = {
+  data: ItemPublic
+  meta?: Record<string, unknown> | null
+  error?: string | null
+}
+
+/**
+ * 从API响应中提取Items集合数据的类型
+ */
+export type ItemsResponse = {
+  data: ItemsPublic
+  meta?: Record<string, unknown> | null
+  error?: string | null
+}

admin/src/client/utils.ts

@@ -6,13 +6,13 @@
  * 检查一个值是否为API响应格式
  */
 export const isApiResponse = (value: unknown): boolean => {
-  if (!value || typeof value !== 'object') {
+  if (!value || typeof value !== "object") {
     return false
   }
-  
+
   const obj = value as Record<string, unknown>
   // 检查是否包含API响应格式的关键字段
-  return ('data' in obj || 'meta' in obj || 'error' in obj)
+  return "data" in obj || "meta" in obj || "error" in obj
 }
 
 /**
@@ -22,41 +22,41 @@ export const extractApiResponseError = (response: unknown): string | null => {
   if (!isApiResponse(response)) {
     return null
   }
-  
+
   const apiResponse = response as Record<string, unknown>
-  
+
   // 直接返回error字段
-  if (typeof apiResponse.error === 'string') {
+  if (typeof apiResponse.error === "string") {
     return apiResponse.error
   }
-  
+
   // 尝试从meta中提取详细错误信息
-  if (apiResponse.meta && typeof apiResponse.meta === 'object') {
+  if (apiResponse.meta && typeof apiResponse.meta === "object") {
     const meta = apiResponse.meta as Record<string, unknown>
-    
+
     // 检查meta中是否有details字段
     if (meta.details) {
       if (Array.isArray(meta.details) && meta.details.length > 0) {
         const firstDetail = meta.details[0]
-        if (typeof firstDetail === 'object' && firstDetail !== null) {
+        if (typeof firstDetail === "object" && firstDetail !== null) {
           // 尝试获取msg或message字段
           const detailObj = firstDetail as Record<string, unknown>
-          if (typeof detailObj.msg === 'string') {
+          if (typeof detailObj.msg === "string") {
             return detailObj.msg
           }
-          if (typeof detailObj.message === 'string') {
+          if (typeof detailObj.message === "string") {
             return detailObj.message
           }
         }
         // 如果是字符串，直接返回
-        if (typeof firstDetail === 'string') {
+        if (typeof firstDetail === "string") {
           return firstDetail
         }
-      } else if (typeof meta.details === 'string') {
+      } else if (typeof meta.details === "string") {
         return meta.details
       }
     }
   }
-  
+
   return null
-} 
+}

admin/src/routes/_layout/items.tsx

@@ -60,17 +60,15 @@ function ItemsTable() {
     })
 
   // 安全地处理API响应
-  const apiData = apiResponse?.data || ({} as any)
-
+  const responseData = apiResponse?.data || {} as any
+  
   // 使用类型断言处理响应数据
-  const items: ItemPublic[] = Array.isArray(apiData.data)
-    ? apiData.data
-    : Array.isArray(apiData)
-      ? apiData
-      : []
-
+  const items: ItemPublic[] = Array.isArray(responseData.data) 
+    ? responseData.data 
+    : []
+
   // 使用类型断言处理计数
-  const count = typeof apiData.count === "number" ? apiData.count : items.length
+  const count = typeof responseData.count === "number" ? responseData.count : items.length
 
   if (isLoading) {
     return <PendingItems />

backend/app/core/config.py

@@ -6,7 +6,6 @@
 
 from pydantic import (
     AnyUrl,
-    BaseModel,
     BeforeValidator,
     EmailStr,
     HttpUrl,
@@ -123,29 +122,37 @@ def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
 
             password = urllib.parse.quote_plus(self.SUPABASE_DB_PASSWORD or "")
 
-            return PostgresDsn(str(URL.build(
-                scheme="postgresql+psycopg",
-                user=self.SUPABASE_DB_USER or "",
-                password=password,
-                host=self.SUPABASE_DB_HOST,
-                port=port,
-                path=f"/{self.SUPABASE_DB_NAME or ''}",
-            )))
+            return PostgresDsn(
+                str(
+                    URL.build(
+                        scheme="postgresql+psycopg",
+                        user=self.SUPABASE_DB_USER or "",
+                        password=password,
+                        host=self.SUPABASE_DB_HOST,
+                        port=port,
+                        path=f"/{self.SUPABASE_DB_NAME or ''}",
+                    )
+                )
+            )
         else:
             # Use standard PostgreSQL connection
             # URL encode the password to handle special characters
             import urllib.parse
 
             password = urllib.parse.quote_plus(self.POSTGRES_PASSWORD)
 
-            return PostgresDsn(str(URL.build(
-                scheme="postgresql+psycopg",
-                user=self.POSTGRES_USER,
-                password=password,
-                host=self.POSTGRES_SERVER,
-                port=self.POSTGRES_PORT,
-                path=f"/{self.POSTGRES_DB}",
-            )))
+            return PostgresDsn(
+                str(
+                    URL.build(
+                        scheme="postgresql+psycopg",
+                        user=self.POSTGRES_USER,
+                        password=password,
+                        host=self.POSTGRES_SERVER,
+                        port=self.POSTGRES_PORT,
+                        path=f"/{self.POSTGRES_DB}",
+                    )
+                )
+            )
 
     SMTP_TLS: bool = True
     SMTP_SSL: bool = False

backend/pyproject.toml

@@ -33,6 +33,7 @@ dev-dependencies = [
     "ruff<1.0.0,>=0.2.2",
     "pre-commit<4.0.0,>=3.6.2",
     "types-passlib<2.0.0.0,>=1.7.7.20240106",
+    "types-requests<3.0.0.0,>=2.32.0",
     "coverage<8.0.0,>=7.4.3",
 ]
 

frontend/app/dashboard/page.tsx

@@ -26,6 +26,17 @@ interface Item {
   owner_id?: string;
 }
 
+// 定义可能的API响应类型
+interface ApiErrorResponse {
+  message?: string;
+  error?: string;
+  meta?: {
+    message?: string;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
+}
+
 export default async function DashboardPage() {
   const itemsResponse = await fetchItems();
 
@@ -37,10 +48,16 @@ export default async function DashboardPage() {
     itemsList = itemsResponse;
     console.log("Dashboard received items:", itemsList.length);
   } else if (itemsResponse && typeof itemsResponse === "object") {
-    if ("message" in itemsResponse) {
-      errorMessage = itemsResponse.message as string;
-      console.error("Dashboard received error:", errorMessage);
+    // 处理可能的错误响应格式
+    const errorResponse = itemsResponse as ApiErrorResponse;
+    if ("message" in errorResponse) {
+      errorMessage = String(errorResponse.message);
+    } else if ("error" in errorResponse) {
+      errorMessage = String(errorResponse.error);
+    } else if (errorResponse.meta && "message" in errorResponse.meta) {
+      errorMessage = String(errorResponse.meta.message);
     }
+    console.error("Dashboard received error:", errorMessage);
   }
 
   return (