Главная Обзор Помощь
Вход
yunoadmin
/
bambuddy
зеркало из https://github.com/maziggy/bambuddy
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Fix PrintModal to fetch library file sliced_for_model

- Added query to fetch library file details in PrintModal
- Updated backend FileResponse schema to include metadata fields (print_name, print_time_seconds, filament_used_grams, sliced_for_model)
- Updated backend get_file endpoint to extract and return metadata fields
- Updated frontend LibraryFile interface to include metadata fields
- Now slicedForModel is properly extracted from both archives and library files

Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com>
copilot-swe-agent[bot] 3 месяцев назад
Родитель
5b1e3e7a2b
Сommit
4cf58f9805
6 измененных файлов с 35 добавлено и 2 удалено
Единый вид Показать статистику Diff
  1. 15 0
      backend/app/api/routes/library.py
  2. 6 0
      backend/app/schemas/library.py
  3. 5 0
      frontend/src/api/client.ts
  4. 8 1
      frontend/src/components/PrintModal/index.tsx
  5. 0 0
      static/assets/index-B-cKFWA3.js
  6. 1 1
      static/index.html

+ 15 - 0
backend/app/api/routes/library.py
Просмотреть файл 

@@ -1873,6 +1873,17 @@ async def get_file(
 
             )
 
             )
 
         duplicate_count = len(duplicates)
 
         duplicate_count = len(duplicates)
 
 
 
+    # Extract key metadata fields
 
+    print_name = None
 
+    print_time = None
 
+    filament_grams = None
 
+    sliced_for_model = None
 
+    if file.file_metadata:
 
+        print_name = file.file_metadata.get("print_name")
 
+        print_time = file.file_metadata.get("print_time_seconds")
 
+        filament_grams = file.file_metadata.get("filament_used_grams")
 
+        sliced_for_model = file.file_metadata.get("sliced_for_model")
 
+
 
     return FileResponseSchema(
 
     return FileResponseSchema(
 
         id=file.id,
 
         id=file.id,
 
         folder_id=file.folder_id,
 
         folder_id=file.folder_id,
 
@@ -1895,6 +1906,10 @@ async def get_file(
 
         created_by_username=file.created_by.username if file.created_by else None,
 
         created_by_username=file.created_by.username if file.created_by else None,
 
         created_at=file.created_at,
 
         created_at=file.created_at,
 
         updated_at=file.updated_at,
 
         updated_at=file.updated_at,
 
+        print_name=print_name,
 
+        print_time_seconds=print_time,
 
+        filament_used_grams=filament_grams,
 
+        sliced_for_model=sliced_for_model,
 
     )
 
     )

+ 6 - 0
backend/app/schemas/library.py
Просмотреть файл 

@@ -130,6 +130,12 @@ class FileResponse(BaseModel):
 
     created_at: datetime
 
     created_at: datetime
 
     updated_at: datetime
 
     updated_at: datetime
 
 
 
+    # Metadata fields
 
+    print_name: str | None = None
 
+    print_time_seconds: int | None = None
 
+    filament_used_grams: float | None = None
 
+    sliced_for_model: str | None = None
 
+
 
     class Config:
 
     class Config:
 
         from_attributes = True
 
         from_attributes = True

+ 5 - 0
frontend/src/api/client.ts
Просмотреть файл 

@@ -3802,6 +3802,11 @@ export interface LibraryFile {
 
   created_by_username: string | null;
 
   created_by_username: string | null;
 
   created_at: string;
 
   created_at: string;
 
   updated_at: string;
 
   updated_at: string;
 
+  // Metadata fields
 
+  print_name: string | null;
 
+  print_time_seconds: number | null;
 
+  filament_used_grams: number | null;
 
+  sliced_for_model: string | null;
 
 }
 
 }
 
 
 
 export interface LibraryFileListItem {
 
 export interface LibraryFileListItem {

+ 8 - 1
frontend/src/components/PrintModal/index.tsx
Просмотреть файл 

@@ -180,8 +180,15 @@ export function PrintModal({
 
     enabled: !!archiveId && !isLibraryFile,
 
     enabled: !!archiveId && !isLibraryFile,
 
   });
 
   });
 
 
 
+  // Fetch library file details to get sliced_for_model
 
+  const { data: libraryFileDetails } = useQuery({
 
+    queryKey: ['library-file', libraryFileId],
 
+    queryFn: () => api.getLibraryFile(libraryFileId!),
 
+    enabled: isLibraryFile && !!libraryFileId,
 
+  });
 
+
 
   // Get sliced_for_model from archive or library file
 
   // Get sliced_for_model from archive or library file
 
-  const slicedForModel = archiveDetails?.sliced_for_model || null;
 
+  const slicedForModel = archiveDetails?.sliced_for_model || libraryFileDetails?.sliced_for_model || null;
 
 
 
   // Fetch plates for archives
 
   // Fetch plates for archives
 
   const { data: archivePlatesData, isError: archivePlatesError } = useQuery({
 
   const { data: archivePlatesData, isError: archivePlatesError } = useQuery({

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
static/assets/index-B-cKFWA3.js


+ 1 - 1
static/index.html
Просмотреть файл 

@@ -23,7 +23,7 @@
 
 
 
     <!-- Splash screens for iOS -->
 
     <!-- Splash screens for iOS -->
 
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
 
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
 
-    <script type="module" crossorigin src="/assets/index-D3RdYLqK.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-B-cKFWA3.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-Mcnrrd7v.css">
 
     <link rel="stylesheet" crossorigin href="/assets/index-Mcnrrd7v.css">
 
   </head>
 
   </head>
 
   <body>
 
   <body>

Некоторые файлы не были показаны из-за большого количества измененных файлов