Fixed issues with the current notetaker implementation

AaronDDM · AaronDDM · commit 28011f576feb · 2025-04-08T16:04:37.000-04:00
diff --git a/examples/notetaker_api_demo/notetaker_demo.py b/examples/notetaker_api_demo/notetaker_demo.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import json
+from datetime import datetime, timedelta
 from nylas import Client
 from nylas.models.notetakers import NotetakerMeetingSettings, NotetakerState, InviteNotetakerRequest
 from nylas.models.errors import NylasApiError
@@ -23,11 +24,11 @@ def invite_notetaker():
         request_body: InviteNotetakerRequest = {
             "meeting_link": meeting_link,
             "name": "Nylas Notetaker",
-            "meeting_settings": {
-                "video_recording": True,
-                "audio_recording": True,
-                "transcription": True
-            }
+            "meeting_settings": NotetakerMeetingSettings(
+                video_recording=True,
+                audio_recording=True,
+                transcription=True
+            )
         }
         
         print(f"Request body: {json.dumps(request_body, indent=2)}")
diff --git a/examples/notetaker_calendar_demo/notetaker_calendar_demo.py b/examples/notetaker_calendar_demo/notetaker_calendar_demo.py
@@ -1,9 +1,20 @@
 import os
 from datetime import datetime, timedelta
+from typing import Optional
 
 from nylas import Client
-from nylas.models.notetakers import NotetakerMeetingSettings, MeetingProvider
-from nylas.models.events import EventMetadata
+from nylas.models.notetakers import Notetaker
+from nylas.models.events import (
+    UpdateEventRequest,
+    CreateEventRequest,
+    EventNotetakerRequest,
+    EventNotetakerSettings,
+    CreateTimespan,
+    CreateEventQueryParams,
+    UpdateEventQueryParams,
+    CreateAutocreate,
+    CreateEventNotetaker
+)
 
 # Initialize the Nylas client
 nylas = Client(
@@ -18,92 +29,147 @@ def create_event_with_notetaker():
     # Create the event
     start_time = datetime.now() + timedelta(days=1)
     end_time = start_time + timedelta(hours=1)
-    
-    event = nylas.events.create(
+
+
+    # Create the request body with proper types
+    request_body = CreateEventRequest(
         title="Project Planning Meeting",
         description="Initial project planning and resource allocation",
-        start_time=start_time,
-        end_time=end_time,
-        metadata=EventMetadata(
-            project_id="PROJ-123",
-            priority="high"
+        when=CreateTimespan(
+            start_time=int(start_time.timestamp()),
+            end_time=int(end_time.timestamp())
+        ),
+        metadata={
+            "project_id": "PROJ-123",
+            "priority": "high"
+        },
+        conferencing=CreateAutocreate(
+            provider="Google Meet",
+            autocreate={}
+        ),
+        notetaker=CreateEventNotetaker(
+            name="Nylas Notetaker",
+            meeting_settings=EventNotetakerSettings(
+                video_recording=True,
+                audio_recording=True,
+                transcription=True
+            )
         )
     )
     
-    # Create a Notetaker bot for the event
-    notetaker = nylas.notetakers.invite(
-        meeting_link=event.conferencing.details.meeting_url,
-        name="Project Planning Notetaker",
-        meeting_settings=NotetakerMeetingSettings(
-            video_recording=True,
-            audio_recording=True,
-            transcription=True
-        )
+    # Create the query parameters
+    query_params = CreateEventQueryParams(
+        calendar_id=os.getenv("NYLAS_CALENDAR_ID")
     )
     
-    print(f"Created event with ID: {event.id}")
-    print(f"Created Notetaker with ID: {notetaker.id}")
-    return event, notetaker
+    event = nylas.events.create(
+        identifier=os.getenv("NYLAS_GRANT_ID"),
+        request_body=request_body,
+        query_params=query_params
+    )
+
+    return event
 
-def get_event_notetaker(event_id):
+
+def get_event_notetaker(event_id: str) -> Optional[Notetaker]:
     """Demonstrates how to retrieve the Notetaker associated with an event."""
     print("\n=== Retrieving Event Notetaker ===")
     
     # First get the event to get the Notetaker ID
-    event = nylas.events.find(event_id)
-    if not event.notetaker or not event.notetaker.id:
+    try:
+        event = nylas.events.find(
+            identifier=os.getenv("NYLAS_GRANT_ID"),
+            event_id=event_id,
+            query_params={"calendar_id": os.getenv("NYLAS_CALENDAR_ID")}
+        )
+    except Exception as e:
+        print(f"Error getting event: {e}")
+        return None
+    
+    if not event.data.notetaker or not event.data.notetaker.id:
         print(f"No Notetaker found for event {event_id}")
         return None
     
-    notetaker = nylas.notetakers.find(event.notetaker.id)
+    notetaker = nylas.notetakers.find(notetaker_id=event.data.notetaker.id, identifier=os.getenv("NYLAS_GRANT_ID"))
     print(f"Found Notetaker for event {event_id}:")
-    print(f"- ID: {notetaker.id}")
-    print(f"- State: {notetaker.state}")
-    print(f"- Meeting Provider: {notetaker.meeting_provider}")
+    print(f"- ID: {notetaker.data.id}")
+    print(f"- State: {notetaker.data.state}")
+    print(f"- Meeting Provider: {notetaker.data.meeting_provider}")
+    print(f"- Meeting Settings:")
+    print(f"  - Video Recording: {notetaker.data.meeting_settings.video_recording}")
+    print(f"  - Audio Recording: {notetaker.data.meeting_settings.audio_recording}")
+    print(f"  - Transcription: {notetaker.data.meeting_settings.transcription}")
     
     return notetaker
 
-def update_event_and_notetaker(event_id, notetaker_id):
+def update_event_and_notetaker(event_id: str, notetaker_id: str):
     """Demonstrates how to update both an event and its Notetaker."""
     print("\n=== Updating Event and Notetaker ===")
     
-    # Update the event
-    updated_event = nylas.events.update(
-        event_id,
+    # Create the notetaker meeting settings
+    notetaker_settings = EventNotetakerSettings(
+        video_recording=False,
+        audio_recording=True,
+        transcription=False
+    )
+    
+    # Create the notetaker request
+    notetaker = EventNotetakerRequest(
+        id=notetaker_id,
+        name="Updated Nylas Notetaker",
+        meeting_settings=notetaker_settings
+    )
+    
+    # Create the update request with proper types
+    request_body = UpdateEventRequest(
         title="Updated Project Planning Meeting",
         description="Revised project planning with new timeline",
-        metadata=EventMetadata(
-            project_id="PROJ-123",
-            priority="urgent"
-        )
+        metadata={
+            "project_id": "PROJ-123",
+            "priority": "urgent"
+        },
+        notetaker=notetaker
     )
     
-    # Update the Notetaker
-    updated_notetaker = nylas.notetakers.update(
-        notetaker_id,
-        name="Updated Project Planning Notetaker",
-        meeting_settings=NotetakerMeetingSettings(
-            video_recording=True,
-            audio_recording=True,
-            transcription=True
-        )
+    # Create the query parameters
+    query_params = UpdateEventQueryParams(
+        calendar_id=os.getenv("NYLAS_CALENDAR_ID")
+    )
+
+    updated_event = nylas.events.update(
+        identifier=os.getenv("NYLAS_GRANT_ID"),
+        event_id=event_id,
+        request_body=request_body,
+        query_params=query_params
     )
     
-    print(f"Updated event with ID: {updated_event.id}")
-    print(f"Updated Notetaker with ID: {updated_notetaker.id}")
-    return updated_event, updated_notetaker
+    return updated_event
 
 def main():
     """Main function to run all demo examples."""
     try:
         # Create an event with a Notetaker
-        event, notetaker = create_event_with_notetaker()
+        event = create_event_with_notetaker()
+        if not event:
+            print("Failed to create event")
+            return
+        
+        print(f"Created event with ID: {event.data.id}")
+        print(f"Event Notetaker ID: {event.data.notetaker.id}")
         
         # Get the Notetaker for the event
-        get_event_notetaker(event.id)
+        notetaker = get_event_notetaker(event.data.id)
+        if not notetaker:
+            print(f"Failed to get Notetaker for event {event.data.id}")
+            return
         
         # Update both the event and its Notetaker
-        updated_event, updated_notetaker = update_event_and_notetaker(event.id, notetaker.id)
+        updated_event = update_event_and_notetaker(event.data.id, notetaker.data.id)
+        if not updated_event:
+            print(f"Failed to update event {event.data.id}")
+            return
+        
+        print(f"Updated event with ID: {updated_event.data.id}")
         
     except Exception as e:
         print(f"An error occurred: {str(e)}")
diff --git a/nylas/models/events.py b/nylas/models/events.py
@@ -706,6 +706,18 @@ class EventNotetakerRequest(TypedDict):
     meeting_settings: NotRequired[EventNotetakerSettings]
 
 
+class CreateEventNotetaker(TypedDict):
+    """
+    Class representing Notetaker settings for an event.
+
+    Attributes:
+        name: The display name for the Notetaker bot.
+        meeting_settings: Notetaker Meeting Settings.
+    """
+
+    name: Optional[str] = "Nylas Notetaker"
+    meeting_settings: Optional[EventNotetakerSettings] = None
+
 class CreateEventRequest(TypedDict):
     """
     Interface representing a request to create an event.
@@ -741,7 +753,7 @@ class CreateEventRequest(TypedDict):
     visibility: NotRequired[Visibility]
     capacity: NotRequired[int]
     hide_participants: NotRequired[bool]
-    notetaker: NotRequired[EventNotetakerRequest]
+    notetaker: NotRequired[CreateEventNotetaker]
 
 
 class UpdateEventRequest(TypedDict):
diff --git a/tests/resources/test_notetakers.py b/tests/resources/test_notetakers.py
@@ -88,7 +88,7 @@ def test_list_notetakers_without_identifier(self, http_client_list_response):
         notetakers.list(query_params=None)
 
         http_client_list_response._execute.assert_called_once_with(
-            "GET", "/v3/grants/notetakers", None, None, None, overrides=None
+            "GET", "/v3/notetakers", None, None, None, overrides=None
         )
 
     def test_list_notetakers_with_query_params(self, http_client_list_response):
@@ -157,7 +157,7 @@ def test_find_notetaker_without_identifier(self, http_client_response):
 
         http_client_response._execute.assert_called_once_with(
             "GET",
-            "/v3/grants/notetakers/notetaker-123",
+            "/v3/notetakers/notetaker-123",
             None,
             None,
             None,
@@ -205,7 +205,7 @@ def test_invite_notetaker_without_identifier(self, http_client_response):
 
         http_client_response._execute.assert_called_once_with(
             "POST",
-            "/v3/grants/notetakers",
+            "/v3/notetakers",
             None,
             None,
             request_body,
@@ -253,7 +253,7 @@ def test_update_notetaker_without_identifier(self, http_client_response):
 
         http_client_response._execute.assert_called_once_with(
             "PATCH",
-            "/v3/grants/notetakers/notetaker-123",
+            "/v3/notetakers/notetaker-123",
             None,
             None,
             request_body,
@@ -286,7 +286,7 @@ def test_leave_meeting_without_identifier(self, http_client_response):
 
         http_client_response._execute.assert_called_once_with(
             "POST",
-            "/v3/grants/notetakers/notetaker-123/leave",
+            "/v3/notetakers/notetaker-123/leave",
             None,
             None,
             None,
@@ -319,7 +319,7 @@ def test_get_media_without_identifier(self, http_client_response):
 
         http_client_response._execute.assert_called_once_with(
             "GET",
-            "/v3/grants/notetakers/notetaker-123/media",
+            "/v3/notetakers/notetaker-123/media",
             None,
             None,
             None,
@@ -352,7 +352,7 @@ def test_cancel_notetaker_without_identifier(self, http_client_delete_response):
 
         http_client_delete_response._execute.assert_called_once_with(
             "DELETE",
-            "/v3/grants/notetakers/notetaker-123/cancel",
+            "/v3/notetakers/notetaker-123/cancel",
             None,
             None,
             None,
