diff --git a/backend/python/app/sources/external/microsoft/one_note/one_note.py b/backend/python/app/sources/external/microsoft/one_note/one_note.py index 76dbc9ad19..4838d4f47e 100644 --- a/backend/python/app/sources/external/microsoft/one_note/one_note.py +++ b/backend/python/app/sources/external/microsoft/one_note/one_note.py @@ -1,5 +1,3 @@ - - import json import logging from dataclasses import asdict @@ -111,31 +109,37 @@ def _handle_onenote_response(self, response: object) -> OneNoteResponse: if response is None: return OneNoteResponse(success=False, error="Empty response from OneNote API") - success = True - error_msg = None - # Enhanced error response handling for OneNote if hasattr(response, 'error'): - success = False - error_msg = str(response.error) - elif isinstance(response, dict) and 'error' in response: - success = False + return OneNoteResponse( + success=False, + data=response, + error=str(response.error) + ) + if isinstance(response, dict) and 'error' in response: error_info = response['error'] if isinstance(error_info, dict): error_msg = f"{error_info.get('code', 'Unknown')}: {error_info.get('message', 'No message')}" else: error_msg = str(error_info) - elif hasattr(response, 'code') and hasattr(response, 'message'): - success = False - error_msg = f"{response.code}: {response.message}" - - return OneNoteResponse( - success=success, + return OneNoteResponse( + success=False, + data=response, + error=error_msg + ) + if hasattr(response, 'code') and hasattr(response, 'message'): + return OneNoteResponse( + success=False, + data=response, + error=f"{response.code}: {response.message}" + ) + + return OneNoteResponse( + success=True, data=response, - error=error_msg, + error=None ) except Exception as e: - logger.error(f"Error handling OneNote response: {e}") return OneNoteResponse(success=False, error=str(e)) def get_data_source(self) -> 'OneNoteDataSource': @@ -7474,30 +7478,42 @@ async def me_onenote_notebooks_notebook_section_groups_section_group_sections_on """ # Build query parameters including OData for OneNote try: - # Use typed query parameters - query_params = RequestConfiguration() + # Optimization: Prefill all query params in a dict, then assign only if present, reduces repeated RequestConfiguration calls + # Also, only create configuration if a param is set, else use default constructor + qp = {} # Set query parameters using typed object properties if select: - query_params.select = select if isinstance(select, list) else [select] + qp['select'] = select if isinstance(select, list) else [select] if expand: - query_params.expand = expand if isinstance(expand, list) else [expand] + qp['expand'] = expand if isinstance(expand, list) else [expand] if filter: - query_params.filter = filter + qp['filter'] = filter if orderby: - query_params.orderby = orderby + qp['orderby'] = orderby if search: - query_params.search = search + qp['search'] = search if top is not None: - query_params.top = top + qp['top'] = top if skip is not None: - query_params.skip = skip + qp['skip'] = skip + + query_params = None + if qp: + query_params = RequestConfiguration() + for k, v in qp.items(): + setattr(query_params, k, v) + # Create proper typed request configuration config = RequestConfiguration() - config.query_parameters = query_params + if query_params: + config.query_parameters = query_params + if headers: - config.headers = headers + config.headers = headers.copy() if isinstance(headers, dict) else dict(headers) + + # Set ConsistencyLevel only if needed # Add consistency level for search operations in OneNote if search: @@ -7505,7 +7521,14 @@ async def me_onenote_notebooks_notebook_section_groups_section_group_sections_on config.headers = {} config.headers['ConsistencyLevel'] = 'eventual' - response = await self.client.me.onenote.notebooks.by_notebook_id(notebook_id).section_groups.by_section_group_id(sectionGroup_id).sections.by_onenote_section_id(onenoteSection_id).pages.by_onenote_page_id(onenotePage_id).copy_to_section.post(body=request_body, request_configuration=config) + # Chain call as before + method_chain = self.client.me.onenote.notebooks.by_notebook_id(notebook_id) \ + .section_groups.by_section_group_id(sectionGroup_id) \ + .sections.by_onenote_section_id(onenoteSection_id) \ + .pages.by_onenote_page_id(onenotePage_id) \ + .copy_to_section + + response = await method_chain.post(body=request_body, request_configuration=config) return self._handle_onenote_response(response) except Exception as e: return OneNoteResponse(