Merge remote-tracking branch 'origin/main' into backend/safety_features

Author: Wunderwaffel

backend/app/llm/openai/provider.py

@@ -41,7 +41,7 @@ async def extract_keywords(self, user_text: str) -> List[str]:
             reasoning={"effort": "low"},
             input=[
                 {
-                    "role": "developer",
+                    "role": "system",
                     "content": KEYWORD_PROMPT,
                 },
                 {
@@ -59,9 +59,9 @@ async def extract_keywords(self, user_text: str) -> List[str]:
         return keyword_list
 
     async def extract_keywords_from_pdf(
-            self,
-            pdf_text: str,
-            query: Optional[str] = None,
+        self,
+        pdf_text: str,
+        query: Optional[str] = None,
     ) -> List[str]:
         """
         Extracts a list of search queries from the full text of a paper and an optional query.
@@ -79,7 +79,7 @@ async def extract_keywords_from_pdf(
             reasoning={"effort": "medium"},
             input=[
                 {
-                    "role": "developer",
+                    "role": "system",
                     "content": PDF_KEYWORD_PROMPT,
                 },
                 {
@@ -141,7 +141,7 @@ async def summarise_paper(self, paper_text: str, query: str) -> Dict[str, Any]:
             reasoning={"effort": "medium"},
             input=[
                 {
-                    "role": "developer",
+                    "role": "system",
                     "content": prompt_content,
                 },
                 {
@@ -175,7 +175,7 @@ async def summarise_paper(self, paper_text: str, query: str) -> Dict[str, Any]:
         return data
 
     async def chat_about_paper(
-            self, paper_text: str, user_query: str, chat_history: List[Dict[str, str]]
+        self, paper_text: str, user_query: str, chat_history: List[Dict[str, str]]
     ) -> str:
         """
         Handles a chat turn using the full paper text as context.

backend/app/routes/paper_routes.py

@@ -10,8 +10,9 @@
 from app.schemas.paper_dto import (
     PaperChatRequest,
     PaperChatResponse,
+    PaperSummaryRequest,
+    PaperSummaryResponse,
 )
-from app.schemas.paper_dto import PaperSummaryRequest, PaperSummaryResponse
 from app.services.paper_service import PaperService
 
 logger = logging.getLogger("inquiro")
@@ -72,8 +73,8 @@ async def chat_with_paper(
     summary="Get the PDF of the specified paper",
 )
 async def get_paper_pdf(
-        paper_id: int,
-        db: AsyncSession = Depends(get_db),
+    paper_id: int,
+    db: AsyncSession = Depends(get_db),
 ) -> StreamingResponse:
     """
     Stream the PDF file of the specified paper.

frontend/src/api/.openapi-generator/FILES

@@ -14,6 +14,7 @@ models/condition-group-children-inner.ts
 models/condition-group.ts
 models/httpvalidation-error.ts
 models/index.ts
+models/location-inner.ts
 models/login-request.ts
 models/login-response.ts
 models/paper-chat-request.ts
@@ -32,5 +33,4 @@ models/search-response.ts
 models/text-condition.ts
 models/user-create.ts
 models/user-response.ts
-models/validation-error-loc-inner.ts
 models/validation-error.ts

frontend/src/api/.openapi-generator/VERSION

@@ -1 +1 @@
-7.18.0-SNAPSHOT
+7.19.0

frontend/src/api/apis/authentication-api.ts

@@ -18,7 +18,7 @@ import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
+import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction, replaceWithSerializableTypeIfNeeded } from '../common';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore

frontend/src/api/apis/paper-api.ts

@@ -18,7 +18,7 @@ import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
+import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction, replaceWithSerializableTypeIfNeeded } from '../common';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore

frontend/src/api/apis/projects-api.ts

@@ -18,7 +18,7 @@ import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
+import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction, replaceWithSerializableTypeIfNeeded } from '../common';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore

frontend/src/api/apis/search-api.ts

@@ -18,7 +18,7 @@ import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
+import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction, replaceWithSerializableTypeIfNeeded } from '../common';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore

frontend/src/api/apis/users-api.ts

@@ -18,7 +18,7 @@ import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common';
+import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction, replaceWithSerializableTypeIfNeeded } from '../common';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore

frontend/src/api/common.ts

@@ -66,7 +66,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
 function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void {
     if (parameter == null) return;
     if (typeof parameter === "object") {
-        if (Array.isArray(parameter)) {
+        if (Array.isArray(parameter) || parameter instanceof Set) {
             (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
         }
         else {
@@ -91,13 +91,26 @@ export const setSearchParams = function (url: URL, ...objects: any[]) {
     url.search = searchParams.toString();
 }
 
+/**
+ * JSON serialization helper function which replaces instances of unserializable types with serializable ones.
+ * This function will run for every key-value pair encountered by JSON.stringify while traversing an object.
+ * Converting a set to a string will return an empty object, so an intermediate conversion to an array is required.
+ */
+export const replaceWithSerializableTypeIfNeeded = function(key: any, value: any) {
+    if (value instanceof Set) {
+        return Array.from(value);
+    } else {
+        return value;
+    }
+}
+
 export const serializeDataIfNeeded = function (value: any, requestOptions: any, configuration?: Configuration) {
     const nonString = typeof value !== 'string';
     const needsSerialization = nonString && configuration && configuration.isJsonMime
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? value : {})
+        ? JSON.stringify(value !== undefined ? value : {}, replaceWithSerializableTypeIfNeeded)
         : (value || "");
 }