fixed system role

main.py

@@ -60,24 +60,25 @@ def build_notion_request(request_data: ChatCompletionRequest) -> NotionRequestBo
     
     # --- Timestamp and User ID Logic ---
     user_id = os.getenv("NOTION_ACTIVE_USER_HEADER")
-    user_messages = [msg for msg in request_data.messages if msg.role == "user"]
-    num_user_messages = len(user_messages)
-    user_message_timestamps = {} # Store timestamps keyed by message id
+    # Get all non-assistant messages to assign timestamps
+    non_assistant_messages = [msg for msg in request_data.messages if msg.role != "assistant"]
+    num_non_assistant_messages = len(non_assistant_messages)
+    message_timestamps = {} # Store timestamps keyed by message id
 
-    if num_user_messages > 0:
+    if num_non_assistant_messages > 0:
         # Get current time specifically in Pacific Time (America/Los_Angeles)
         pacific_tz = ZoneInfo("America/Los_Angeles")
         now_pacific = datetime.now(timezone.utc).astimezone(pacific_tz)
 
-        # Assign timestamp to the last user message
-        last_user_msg_id = user_messages[-1].id
-        user_message_timestamps[last_user_msg_id] = now_pacific
+        # Assign timestamp to the last non-assistant message
+        last_msg_id = non_assistant_messages[-1].id
+        message_timestamps[last_msg_id] = now_pacific
 
-        # Calculate timestamps for previous user messages (10 mins earlier each)
+        # Calculate timestamps for previous non-assistant messages (random intervals earlier)
         current_timestamp = now_pacific
-        for i in range(num_user_messages - 2, -1, -1): # Iterate backwards from second-to-last
+        for i in range(num_non_assistant_messages - 2, -1, -1): # Iterate backwards from second-to-last
             current_timestamp -= timedelta(minutes=random.randint(3, 20)) # Use random interval (3-20 mins)
-            user_message_timestamps[user_messages[i].id] = current_timestamp
+            message_timestamps[non_assistant_messages[i].id] = current_timestamp
 
     # --- Build Transcript ---
     # Get current time in Pacific timezone for context
@@ -121,14 +122,14 @@ def build_notion_request(request_data: ChatCompletionRequest) -> NotionRequestBo
 
     for message in request_data.messages:
         if message.role == "assistant":
-            # Assistant messages get a traceId, but not userId or createdAt
+            # Assistant messages get type="markdown-chat" and a traceId
             transcript.append(NotionTranscriptItem(
                 type="markdown-chat",
                 value=message.content,
                 traceId=str(uuid.uuid4()) # Generate unique traceId for assistant message
             ))
-        elif message.role == "user":
-            created_at_dt = user_message_timestamps.get(message.id)
+        else: # Treat all other roles (user, system, etc.) as "user" type
+            created_at_dt = message_timestamps.get(message.id) # Use the unified timestamp dict
             created_at_iso = None
             if created_at_dt:
                 # Format timestamp exactly as YYYY-MM-DDTHH:MM:SS.fff-HH:MM
@@ -139,48 +140,29 @@ def build_notion_request(request_data: ChatCompletionRequest) -> NotionRequestBo
                 created_at_iso = f"{dt_str}.{ms}{formatted_tz}"
 
             content = message.content
-            if isinstance(content, str):
-                notion_value = [[content]] if content else [[""]]
-                transcript.append(NotionTranscriptItem(
-                    type="user",
-                    value=notion_value,
-                    userId=user_id,
-                    createdAt=created_at_iso
-                ))
-            elif isinstance(content, list):
-                found_text_part = False
-                for part in content:
+            # Ensure content is treated as a string for user/system messages
+            if isinstance(content, list):
+                 # Attempt to extract text from list format, default to empty string
+                 text_content = ""
+                 for part in content:
                      if isinstance(part, dict) and part.get("type") == "text":
-                        text_content = part.get("text")
-                        if isinstance(text_content, str) and text_content:
-                            # Append separate item for each text part, with same userId/timestamp
-                            transcript.append(NotionTranscriptItem(
-                                type="user",
-                                value=[[text_content]],
-                                userId=user_id,
-                                createdAt=created_at_iso
-                            ))
-                            found_text_part = True
-                if not found_text_part:
-                    # Append default empty item if no valid text parts found
-                    transcript.append(NotionTranscriptItem(
-                        type="user",
-                        value=[[""]],
-                        userId=user_id,
-                        createdAt=created_at_iso # Still add userId/timestamp
-                    ))
-                    print(f'Warning: No valid text parts found in user message list content: {message}')
-            else:
-                 # Handle unexpected content types with default empty item
-                transcript.append(NotionTranscriptItem(
-                    type="user",
-                    value=[[""]],
-                    userId=user_id,
-                    createdAt=created_at_iso # Still add userId/timestamp
-                ))
-                print(f'Warning: Unexpected content type in user message: {message}')
-        # System messages are currently ignored in the Notion transcript based on original logic
-        # else: # Handle 'system' role if needed in the future
+                         text_part = part.get("text")
+                         if isinstance(text_part, str):
+                             text_content += text_part # Concatenate text parts if needed
+                 content = text_content if text_content else "" # Use extracted text or empty string
+            elif not isinstance(content, str):
+                 content = "" # Default to empty string if not list or string
+
+            # Format value as expected by Notion for user type: [[content_string]]
+            notion_value = [[content]] if content else [[""]]
+
+            transcript.append(NotionTranscriptItem(
+                type="user", # Set type to "user" for non-assistant roles
+                value=notion_value,
+                userId=user_id, # Assign userId
+                createdAt=created_at_iso # Assign timestamp
+                # No traceId for user/system messages
+            ))
 
     # Use globally configured spaceId, set createThread=True
     return NotionRequestBody(