Update api/routes.py

api/routes.py

@@ -8,6 +8,7 @@ from bson import ObjectId
 from typing import Optional, List, Dict
 from pydantic import BaseModel, Field
 from pymongo import UpdateOne, InsertOne, IndexModel
+from pymongo.errors import BulkWriteError
 import httpx
 import os
 import json
@@ -17,6 +18,7 @@ from motor.motor_asyncio import AsyncIOMotorClient
 import logging
 import time
 import uuid
+import re
 
 # Configure logging
 logging.basicConfig(
@@ -54,6 +56,15 @@ class PatientUpdate(BaseModel):
     conditions: Optional[List[Condition]] = None
     medications: Optional[List[Medication]] = None
 
+# Language mapping for MongoDB compatibility
+LANGUAGE_MAP = {
+    'English (United States)': 'en',
+    'English': 'en',
+    'Spanish (United States)': 'es',
+    'Spanish': 'es',
+    # Add more mappings as needed
+}
+
 # Indexes
 async def create_indexes():
     try:
@@ -81,6 +92,12 @@ def calculate_age(birth_date: str) -> Optional[int]:
         logger.warning(f"Invalid birth date format: {birth_date}, error: {str(e)}")
         return None
 
+def standardize_language(language: str) -> str:
+    """Convert language to MongoDB-compatible language code."""
+    if not language:
+        return 'en'  # Default to English
+    return LANGUAGE_MAP.get(language, 'en')
+
 async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict]:
     logger.debug(f"Processing patient from file: {file_path}")
     patient_data = {}
@@ -118,7 +135,7 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
                     'postal_code': address.get('postalCode', ''),
                     'country': address.get('country', ''),
                     'marital_status': resource.get('maritalStatus', {}).get('text', ''),
-                    'language': resource.get('communication', [{}])[0].get('language', {}).get('text', ''),
+                    'language': standardize_language(resource.get('communication', [{}])[0].get('language', {}).get('text', '')),
                     'source': 'synthea',
                     'last_updated': datetime.utcnow()
                 }
@@ -207,12 +224,16 @@ async def import_patients(
                 detail="Data directory not found"
             )
             
-        files = glob.glob(str(SYNTHEA_DATA_DIR / "*.json"))
+        # Filter out non-patient files
+        files = [
+            f for f in glob.glob(str(SYNTHEA_DATA_DIR / "*.json"))
+            if not re.search(r'(hospitalInformation|practitionerInformation)\d+\.json$', f)
+        ]
         if not files:
-            logger.warning("No JSON files found in synthea data directory")
+            logger.warning("No valid patient JSON files found in synthea data directory")
             return {
                 "status": "success",
-                "message": "No data files found",
+                "message": "No patient data files found",
                 "imported": 0,
                 "request_id": request_id
             }
@@ -278,13 +299,24 @@ async def import_patients(
         
         if operations:
             try:
-                result = await patients_collection.bulk_write(operations)
+                result = await patients_collection.bulk_write(operations, ordered=False)
                 response.update({
                     "upserted": result.upserted_count,
                     "existing": len(operations) - result.upserted_count
                 })
                 logger.info(f"Import request {request_id} completed: {imported} patients processed, "
                            f"{result.upserted_count} upserted, {len(errors)} errors")
+            except BulkWriteError as bwe:
+                logger.error(f"Partial bulk write failure for request {request_id}: {str(bwe.details)}")
+                response.update({
+                    "upserted": bwe.details.get('nUpserted', 0),
+                    "existing": len(operations) - bwe.details.get('nUpserted', 0),
+                    "write_errors": [
+                        f"Index {err['index']}: {err['errmsg']}" for err in bwe.details.get('writeErrors', [])
+                    ]
+                })
+                logger.info(f"Import request {request_id} partially completed: {imported} patients processed, "
+                           f"{response['upserted']} upserted, {len(errors)} errors")
             except Exception as e:
                 logger.error(f"Bulk write failed for request {request_id}: {str(e)}")
                 raise HTTPException(
@@ -450,7 +482,7 @@ async def add_note(
         note_data = note.dict()
         note_data.update({
             "author": current_user.get('full_name', 'System'),
-            "timestamp": datetime.utcnow()
+            туристика datetime.utcnow()
         })
         
         result = await patients_collection.update_one(