order and api and more

app/services/pull_sheet_service.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from jinja2 import Environment, FileSystemLoader
 from weasyprint import HTML
 import logging
+import asyncio
 
 logger = logging.getLogger(__name__)
 
@@ -16,7 +17,7 @@ class PullSheetService:
         self.output_dir = Path("app/data/cache/tcgplayer/pull_sheets")
         self.output_dir.mkdir(parents=True, exist_ok=True)
         
-    def generate_pull_sheet_pdf(self, csv_path: str) -> str:
+    async def generate_pull_sheet_pdf(self, csv_path: str) -> str:
         """Generate a PDF pull sheet from a CSV file.
         
         Args:
@@ -27,7 +28,7 @@ class PullSheetService:
         """
         try:
             # Read and process CSV data
-            items = self._read_and_process_csv(csv_path)
+            items = await self._read_and_process_csv(csv_path)
             
             # Prepare template data
             template_data = {
@@ -38,9 +39,12 @@ class PullSheetService:
             # Render HTML
             html_content = self.template.render(**template_data)
             
-            # Generate PDF
+            # Generate PDF in a separate thread to avoid blocking
             pdf_path = self.output_dir / f"pull_sheet_{datetime.now().strftime('%Y%m%d_%H%M%S')}.pdf"
-            HTML(string=html_content).write_pdf(str(pdf_path))
+            await asyncio.get_event_loop().run_in_executor(
+                None,
+                lambda: HTML(string=html_content).write_pdf(str(pdf_path))
+            )
             
             return str(pdf_path)
             
@@ -48,7 +52,7 @@ class PullSheetService:
             logger.error(f"Error generating pull sheet PDF: {str(e)}")
             raise
             
-    def _read_and_process_csv(self, csv_path: str) -> List[Dict]:
+    async def _read_and_process_csv(self, csv_path: str) -> List[Dict]:
         """Read and process CSV data using pandas.
         
         Args:
@@ -57,8 +61,11 @@ class PullSheetService:
         Returns:
             List of processed items
         """
-        # Read CSV into pandas DataFrame
-        df = pd.read_csv(csv_path)
+        # Read CSV into pandas DataFrame in a separate thread to avoid blocking
+        df = await asyncio.get_event_loop().run_in_executor(
+            None,
+            lambda: pd.read_csv(csv_path)
+        )
         
         # Filter out the "Orders Contained in Pull Sheet" row
         df = df[df['Product Line'] != 'Orders Contained in Pull Sheet:']
@@ -67,7 +74,7 @@ class PullSheetService:
         df['Set Release Date'] = pd.to_datetime(df['Set Release Date'], format='%m/%d/%Y %H:%M:%S')
         
         # Sort by Set Release Date (descending) and then Product Name (ascending)
-        df = df.sort_values(['Set Release Date', 'Product Name'], ascending=[False, True])
+        df = df.sort_values(['Set Release Date', 'Set', 'Product Name'], ascending=[False, True, True])
         
         # Convert to list of dictionaries
         items = []
@@ -77,7 +84,8 @@ class PullSheetService:
                 'condition': row['Condition'],
                 'quantity': str(int(row['Quantity'])),  # Convert to string for template
                 'set': row['Set'],
-                'rarity': row['Rarity']
+                'rarity': row['Rarity'],
+                'card_number': str(int(row['Number'])) if 'Number' in row else ''
             })
                 
         return items