Update src/services/journal_engine.py

src/services/journal_engine.py

@@ -1,9 +1,10 @@
+
 import json
 import io
 import os
 import re
+import uuid
 from googleapiclient.discovery import build
-# [FIX] Import MediaIoBaseUpload instead of the non-existent MediaByteArrayUpload
 from googleapiclient.http import MediaIoBaseUpload, MediaIoBaseDownload
 from google.oauth2.credentials import Credentials
 from ..config import get_user_keys, update_user_keys
@@ -20,23 +21,29 @@ class JournalEngine:
 
     @staticmethod
     def get_drive_service(creds):
+        """Builds the Drive API client."""
         return build('drive', 'v3', credentials=creds)
 
     @staticmethod
     def load_journal(service, file_id):
         """Downloads and parses the journal.json from Drive."""
-        request = service.files().get_media(fileId=file_id)
-        fh = io.BytesIO()
-        downloader = MediaIoBaseDownload(fh, request)
-        done = False
-        while not done:
-            status, done = downloader.next_chunk()
-        return json.loads(fh.getvalue().decode('utf-8'))
+        try:
+            request = service.files().get_media(fileId=file_id)
+            fh = io.BytesIO()
+            downloader = MediaIoBaseDownload(fh, request)
+            done = False
+            while not done:
+                status, done = downloader.next_chunk()
+            
+            content = fh.getvalue().decode('utf-8')
+            return json.loads(content) if content else []
+        except Exception as e:
+            print(f"⚠️ Journal Load Error: {e}")
+            return []
 
     @staticmethod
     def save_to_drive(service, file_id, journal_data):
         """Uploads the updated journal list back to the hidden AppData folder."""
-        # [FIX] Use MediaIoBaseUpload with a BytesIO stream
         media = MediaIoBaseUpload(
             io.BytesIO(json.dumps(journal_data).encode('utf-8')), 
             mimetype='application/json',
@@ -47,34 +54,39 @@ class JournalEngine:
     @staticmethod
     def initialize_journal(service):
         """Finds or creates 'journal.json' in the appDataFolder."""
-        response = service.files().list(
-            spaces='appDataFolder',
-            fields='files(id, name)',
-            pageSize=1
-        ).execute()
-        
-        files = response.get('files', [])
-        if files:
-            return files[0]['id']
-        
-        # Create it if it doesn't exist
-        file_metadata = {
-            'name': 'journal.json',
-            'parents': ['appDataFolder']
-        }
-        # [FIX] Use MediaIoBaseUpload here too
-        media = MediaIoBaseUpload(
-            io.BytesIO(json.dumps([]).encode('utf-8')), 
-            mimetype='application/json',
-            resumable=True
-        )
-        file = service.files().create(body=file_metadata, media_body=media, fields='id').execute()
-        return file.get('id')
+        try:
+            response = service.files().list(
+                q="name='journal.json' and 'appDataFolder' in parents",
+                spaces='appDataFolder',
+                fields='files(id, name)',
+                pageSize=1
+            ).execute()
+            
+            files = response.get('files', [])
+            if files:
+                return files[0]['id']
+            
+            # Create it if it doesn't exist
+            file_metadata = {
+                'name': 'journal.json',
+                'parents': ['appDataFolder']
+            }
+            media = MediaIoBaseUpload(
+                io.BytesIO(json.dumps([]).encode('utf-8')), 
+                mimetype='application/json',
+                resumable=True
+            )
+            file = service.files().create(body=file_metadata, media_body=media, fields='id').execute()
+            return file.get('id')
+        except Exception as e:
+            print(f"⚠️ Journal Init Error: {e}")
+            return None
 
     @staticmethod
     def parse_pnl(pnl_str):
         """Helper to extract a numeric value from strings like '+$500' or '-10%'."""
         try:
+            # Remove currency symbols ($) and percentages (%), keep minus signs and decimals
             clean = re.sub(r'[^\d\.-]', '', str(pnl_str))
             return float(clean) if clean else 0.0
         except ValueError:
@@ -90,13 +102,53 @@ class JournalEngine:
         total = len(journal_data)
         
         winrate = (len(wins) / total) * 100 if total > 0 else 0
+        
+        # Find best trade based on numeric PnL
         best_trade = max(journal_data, key=lambda x: cls.parse_pnl(x.get('pnl', 0)), default={})
         
-        biases = [t.get('bias', 'Neutral') for t in journal_data if t.get('bias')]
+        # Determine dominant bias
+        biases = [t.get('bias') for t in journal_data if t.get('bias')]
         main_bias = max(set(biases), key=biases.count) if biases else "Neutral"
 
         return {
             "winrate": f"{winrate:.0f}%",
             "best_trade": best_trade.get('ticker', '--'),
             "bias": main_bias
-        }
+        }
+
+    @classmethod
+    def save_trade(cls, service, file_id, trade_data):
+        """
+        Handles the Upsert (Update or Insert) logic.
+        - If 'id' exists in trade_data -> Update existing entry.
+        - If 'id' is missing/empty -> Generate UUID and Append.
+        """
+        # 1. Load current history
+        journal = cls.load_journal(service, file_id)
+        
+        # 2. Check for ID
+        trade_id = trade_data.get('id')
+        
+        if trade_id:
+            # --- UPDATE MODE ---
+            updated = False
+            for i, existing_trade in enumerate(journal):
+                if existing_trade.get('id') == trade_id:
+                    # Preserve any fields not in the form if necessary, 
+                    # but here we overwrite with the new form state.
+                    journal[i] = trade_data 
+                    updated = True
+                    break
+            
+            # Safety fallback: If ID provided but not found, treat as new
+            if not updated:
+                trade_data['id'] = str(uuid.uuid4())
+                journal.append(trade_data)
+        else:
+            # --- CREATE MODE ---
+            trade_data['id'] = str(uuid.uuid4())
+            journal.append(trade_data)
+            
+        # 3. Save back to Drive
+        cls.save_to_drive(service, file_id, journal)
+        return True