nuclia 4.8.8__py3-none-any.whl → 4.8.10__py3-none-any.whl

nuclia/lib/kb.py

@@ -1,5 +1,4 @@
 import base64
-import csv
 import os
 from enum import Enum
 from typing import Dict, Optional, Union
@@ -15,17 +14,17 @@ from tqdm import tqdm
 from nuclia_models.events.activity_logs import (  # type: ignore
     ActivityLogsQuery,
     ActivityLogsSearchQuery,
-    ActivityLogsChatQuery,
+    ActivityLogsAskQuery,
     DownloadActivityLogsQuery,
     DownloadActivityLogsSearchQuery,
-    DownloadActivityLogsChatQuery,
+    DownloadActivityLogsAskQuery,
     EventType,
     DownloadFormat,
 )
 from nuclia_models.events.remi import RemiQuery
 from nuclia_models.worker.tasks import TaskStartKB
 from nuclia.exceptions import RateLimitError
-from nuclia.lib.utils import handle_http_errors
+from nuclia.lib.utils import handle_http_sync_errors, handle_http_async_errors
 from datetime import datetime
 from nuclia.lib.utils import build_httpx_client, build_httpx_async_client, USER_AGENT
 
@@ -46,11 +45,9 @@ DOWNLOAD_EXPORT_URL = "/export/{export_id}"
 DOWNLOAD_URL = "/{uri}"
 TUS_UPLOAD_RESOURCE_URL = "/resource/{rid}/file/{field}/tusupload"
 TUS_UPLOAD_URL = "/tusupload"
-LEGACY_ACTIVITY_LOG_URL = "/activity/download?type={type}&month={month}"
 ACTIVITY_LOG_URL = "/activity/{type}/query/download"
 ACTIVITY_LOG_DOWNLOAD_REQUEST_URL = "/activity/download_request/{request_id}"
 ACTIVITY_LOG_QUERY_URL = "/activity/{type}/query"
-FEEDBACK_LOG_URL = "/feedback/{month}"
 NOTIFICATIONS = "/notifications"
 REMI_QUERY_URL = "/remi/query"
 REMI_EVENT_URL = "/remi/events/{event_id}"
@@ -73,23 +70,6 @@ class Environment(str, Enum):
     OSS = "OSS"
 
 
-class LogType(str, Enum):
-    # Nucliadb
-    VISITED = "visited"
-    MODIFIED = "modified"
-    DELETED = "deleted"
-    NEW = "new"
-    SEARCH = "search"
-    SUGGEST = "suggest"
-    INDEXED = "indexed"
-    CHAT = "chat"
-    # Tasks
-    STARTED = "started"
-    STOPPED = "stopped"
-    # Processor
-    PROCESSED = "processed"
-
-
 class BaseNucliaDBClient:
     environment: Environment
     base_url: str
@@ -220,7 +200,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             raise Exception("KB not configured")
         url = f"{self.url}{NOTIFICATIONS}"
         response = self.stream_session.get(url, stream=True, timeout=3660)
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def ask(self, request: AskRequest, timeout: int = 1000):
@@ -233,7 +213,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             stream=True,
             timeout=timeout,
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def download_export(self, export_id: str, path: str, chunk_size: int):
@@ -276,7 +256,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         new_uri = "/".join(uri_parts[3:])
         url = DOWNLOAD_URL.format(uri=new_uri)
         response: httpx.Response = self.reader_session.get(url)
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response.content
 
     @backoff.on_exception(
@@ -320,7 +300,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             headers["x-extract-strategy"] = extract_strategy
 
         response: httpx.Response = self.writer_session.post(url, headers=headers)
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response.headers.get("Location")
 
     def patch_tus_upload(self, upload_url: str, data: bytes, offset: int) -> int:
@@ -338,7 +318,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.writer_session.patch(
             url, headers=headers, content=data
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return int(response.headers.get("Upload-Offset"))
 
     def summarize(self, request: SummarizeRequest, timeout: int = 1000):
@@ -349,44 +329,13 @@ class NucliaDBClient(BaseNucliaDBClient):
         response = self.reader_session.post(
             url, json=request.model_dump(), timeout=timeout
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
-    def logs(self, type: LogType, month: str) -> list[list[str]]:
-        if self.reader_session is None:
-            raise Exception("KB not configured")
-
-        if type != "feedback":
-            url = LEGACY_ACTIVITY_LOG_URL.format(type=type.value, month=month)
-            response: httpx.Response = self.reader_session.get(url)
-            handle_http_errors(response)
-            return [row for row in csv.reader(response.iter_lines())]
-        else:
-            feedback_url = f"{self.url}{FEEDBACK_LOG_URL.format(month=month)}"
-            feedback_response: httpx.Response = self.reader_session.get(feedback_url)
-            handle_http_errors(feedback_response)
-            feedbacks = [row for row in csv.reader(feedback_response.iter_lines())]
-            answers = self.logs(type=LogType.CHAT, month=month)
-            # first row with the columns headers
-            results = [[*feedbacks[0], *answers[0][:-1]]]
-            for feedback in feedbacks[1:]:
-                learning_id = feedback[1]
-                # search for the corresponding question/answer
-                # (the learning id is the same for both question/answer and feedback,
-                # and is the second column in the Q/A csv)
-                matching_answers = [
-                    answer for answer in answers if answer[1] == learning_id
-                ]
-                if len(matching_answers) > 0:
-                    results.append([*feedback, *matching_answers[0][:-1]])
-                else:
-                    results.append(feedback)
-            return results
-
     def logs_query(
         self,
         type: EventType,
-        query: Union[ActivityLogsQuery, ActivityLogsSearchQuery, ActivityLogsChatQuery],
+        query: Union[ActivityLogsQuery, ActivityLogsSearchQuery, ActivityLogsAskQuery],
     ) -> requests.Response:
         if self.stream_session is None:
             raise Exception("KB not configured")
@@ -396,7 +345,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             json=query.model_dump(mode="json", exclude_unset=True),
             stream=True,
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def logs_download(
@@ -405,7 +354,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         query: Union[
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ],
         download_format: DownloadFormat,
     ):
@@ -420,7 +369,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             json=query.model_dump(mode="json", exclude_unset=True),
             headers={"accept": format_header_value},
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def get_download_request(
@@ -431,7 +380,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             raise Exception("KB not configured")
         download_request_url = f"{self.url}{ACTIVITY_LOG_DOWNLOAD_REQUEST_URL.format(request_id=request_id)}"
         response: httpx.Response = self.reader_session.get(download_request_url)
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def remi_query(
@@ -446,7 +395,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             json=query.model_dump(mode="json", exclude_unset=True),
             timeout=10,
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def get_remi_event(
@@ -459,7 +408,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.reader_session.get(
             f"{self.url}{REMI_EVENT_URL.format(event_id=event_id)}"
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def get_remi_scores(
@@ -476,7 +425,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.reader_session.get(
             f"{self.url}{REMI_SCORES_URL}", params=params, timeout=10
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def list_tasks(self) -> httpx.Response:
@@ -484,7 +433,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             raise Exception("KB not configured")
 
         response: httpx.Response = self.reader_session.get(f"{self.url}{LIST_TASKS}")
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def start_task(self, body: TaskStartKB) -> httpx.Response:
@@ -495,7 +444,7 @@ class NucliaDBClient(BaseNucliaDBClient):
             f"{self.url}{START_TASK}",
             json=body.model_dump(mode="json", exclude_unset=True),
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def delete_task(self, task_id: str) -> httpx.Response:
@@ -505,7 +454,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.writer_session.delete(
             f"{self.url}{DELETE_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def stop_task(self, task_id: str) -> httpx.Response:
@@ -515,7 +464,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.writer_session.post(
             f"{self.url}{STOP_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def get_task(self, task_id: str) -> httpx.Response:
@@ -525,7 +474,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.reader_session.get(
             f"{self.url}{GET_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
     def restart_task(self, task_id: str) -> httpx.Response:
@@ -535,7 +484,7 @@ class NucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = self.writer_session.post(
             f"{self.url}{RESTART_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        handle_http_sync_errors(response)
         return response
 
 
@@ -583,7 +532,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         url = f"{self.url}{NOTIFICATIONS}"
         req = self.reader_session.build_request("GET", url, timeout=3660)
         response = await self.reader_session.send(req, stream=True)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def ask(self, request: AskRequest, timeout: int = 1000):
@@ -594,7 +543,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             "POST", url, json=request.model_dump(), timeout=timeout
         )
         response = await self.reader_session.send(req, stream=True)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def download_export(self, export_id: str, path: str, chunk_size: int):
@@ -635,7 +584,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         new_uri = "/".join(uri_parts[3:])
         url = DOWNLOAD_URL.format(uri=new_uri)
         response = await self.reader_session.get(url)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response.content
 
     @backoff.on_exception(
@@ -679,7 +628,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             headers["x-extract-strategy"] = extract_strategy
 
         response = await self.writer_session.post(url, headers=headers)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response.headers.get("Location")
 
     async def patch_tus_upload(self, upload_url: str, data: bytes, offset: int) -> int:
@@ -695,7 +644,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             url = httpx.URL("/".join(url.path.split("/")[3:]))
 
         response = await self.writer_session.patch(url, headers=headers, content=data)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return int(response.headers.get("Upload-Offset"))
 
     async def summarize(self, request: SummarizeRequest, timeout: int = 1000):
@@ -706,46 +655,13 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response = await self.reader_session.post(
             url, json=request.model_dump(), timeout=timeout
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
-    async def logs(self, type: LogType, month: str) -> list[list[str]]:
-        if self.reader_session is None:
-            raise Exception("KB not configured")
-
-        if type != "feedback":
-            url = LEGACY_ACTIVITY_LOG_URL.format(type=type.value, month=month)
-            response: httpx.Response = await self.reader_session.get(url)
-            handle_http_errors(response)
-            return [row for row in csv.reader(response.iter_lines())]
-        else:
-            feedback_url = f"{self.url}{FEEDBACK_LOG_URL.format(month=month)}"
-            feedback_response: httpx.Response = await self.reader_session.get(
-                feedback_url
-            )
-            handle_http_errors(feedback_response)
-            feedbacks = [row for row in csv.reader(feedback_response.iter_lines())]
-            answers = await self.logs(type=LogType.CHAT, month=month)
-            # first row with the columns headers
-            results = [[*feedbacks[0], *answers[0][:-1]]]
-            for feedback in feedbacks[1:]:
-                learning_id = feedback[1]
-                # search for the corresponding question/answer
-                # (the learning id is the same for both question/answer and feedback,
-                # and is the second column in the Q/A csv)
-                matching_answers = [
-                    answer for answer in answers if answer[1] == learning_id
-                ]
-                if len(matching_answers) > 0:
-                    results.append([*feedback, *matching_answers[0][:-1]])
-                else:
-                    results.append(feedback)
-            return results
-
     async def logs_query(
         self,
         type: EventType,
-        query: Union[ActivityLogsQuery, ActivityLogsSearchQuery, ActivityLogsChatQuery],
+        query: Union[ActivityLogsQuery, ActivityLogsSearchQuery, ActivityLogsAskQuery],
     ) -> httpx.Response:
         if self.reader_session is None:
             raise Exception("KB not configured")
@@ -754,7 +670,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             f"{self.url}{ACTIVITY_LOG_QUERY_URL.format(type=type.value)}",
             json=query.model_dump(mode="json", exclude_unset=True),
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def logs_download(
@@ -763,7 +679,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         query: Union[
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ],
         download_format: DownloadFormat,
     ):
@@ -778,7 +694,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             json=query.model_dump(mode="json", exclude_unset=True),
             headers={"accept": format_header_value},
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def get_download_request(
@@ -789,7 +705,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             raise Exception("KB not configured")
         download_request_url = f"{self.url}{ACTIVITY_LOG_DOWNLOAD_REQUEST_URL.format(request_id=request_id)}"
         response: httpx.Response = await self.reader_session.get(download_request_url)
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def remi_query(
@@ -804,7 +720,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             json=query.model_dump(mode="json", exclude_unset=True),
             timeout=10,
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def get_remi_event(
@@ -817,7 +733,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.reader_session.get(
             f"{self.url}{REMI_EVENT_URL.format(event_id=event_id)}"
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def get_remi_scores(
@@ -834,7 +750,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.reader_session.get(
             f"{self.url}{REMI_SCORES_URL}", params=params, timeout=10
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def list_tasks(self) -> httpx.Response:
@@ -844,7 +760,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.reader_session.get(
             f"{self.url}{LIST_TASKS}"
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def start_task(self, body: TaskStartKB) -> httpx.Response:
@@ -855,7 +771,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
             f"{self.url}{START_TASK}",
             json=body.model_dump(mode="json", exclude_unset=True),
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def delete_task(self, task_id: str) -> httpx.Response:
@@ -865,7 +781,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.writer_session.delete(
             f"{self.url}{DELETE_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def stop_task(self, task_id: str) -> httpx.Response:
@@ -875,7 +791,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.writer_session.post(
             f"{self.url}{STOP_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def get_task(self, task_id: str) -> httpx.Response:
@@ -885,7 +801,7 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.reader_session.get(
             f"{self.url}{GET_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response
 
     async def restart_task(self, task_id: str) -> httpx.Response:
@@ -895,5 +811,5 @@ class AsyncNucliaDBClient(BaseNucliaDBClient):
         response: httpx.Response = await self.writer_session.post(
             f"{self.url}{RESTART_TASK.format(task_id=task_id)}",
         )
-        handle_http_errors(response)
+        await handle_http_async_errors(response)
         return response

nuclia/lib/utils.py

@@ -1,9 +1,9 @@
 import json
-from typing import Union
 
 import httpx
 import importlib.metadata
 import requests
+from httpx import Response as HttpxResponse, HTTPStatusError
 from tabulate import tabulate
 from typing import Optional
 
@@ -18,24 +18,67 @@ from nucliadb_models.search import SyncAskResponse
 from nuclia.lib.models import ActivityLogsOutput
 from nuclia_models.worker.tasks import TaskDefinition, TaskList
 from nucliadb_models.resource import KnowledgeBoxList
+from requests import Response as RequestsResponse, HTTPError as RequestsHTTPError
+
 
 USER_AGENT = f"nuclia.py/{importlib.metadata.version('nuclia')}"
 
 
-def handle_http_errors(response: Union[httpx.Response, requests.models.Response]):
-    if (
-        response.status_code == 403
-        and "Hydra token is either unexistent or revoked" in response.text
-    ):
+def handle_http_sync_errors(response):
+    try:
+        content = response.text
+    except (httpx.ResponseNotRead, requests.exceptions.RequestException):
+        content = "<streaming content not read>"
+    except Exception as e:
+        content = f"<error decoding content: {e}>"
+
+    _raise_for_status(response.status_code, content, response=response)
+
+
+async def handle_http_async_errors(response: httpx.Response):
+    try:
+        if not response.is_closed and not response.is_stream_consumed:
+            await response.aread()
+    except Exception as e:
+        content = f"<failed to read stream: {e}>"
+        _raise_for_status(
+            response.status_code, content, response=response, request=response.request
+        )
+        return  # Defensive
+    try:
+        content = response.text
+    except httpx.ResponseNotRead:
+        content = "<streaming content not read>"
+    except Exception as e:
+        content = f"<error decoding content: {e}>"
+
+    _raise_for_status(
+        response.status_code, content, response=response, request=response.request
+    )
+
+
+def _raise_for_status(status_code: int, content: str, response=None, request=None):
+    if status_code == 403 and "Hydra token is either unexistent or revoked" in content:
         raise UserTokenExpired()
-    elif response.status_code == 429:
-        raise RateLimitError(f"Rate limited: {response.text}")
-    elif response.status_code == 409:
-        raise DuplicateError(f"Duplicate resource: {response.text}")
-    elif response.status_code == 422:
-        raise InvalidPayload(f"Invalid payload: {response.text}")
-    elif response.status_code >= 400:
-        raise httpx.HTTPError(f"Status code {response.status_code}: {response.text}")
+    elif status_code == 429:
+        raise RateLimitError(f"Rate limited: {content}")
+    elif status_code == 409:
+        raise DuplicateError(f"Duplicate resource: {content}")
+    elif status_code == 422:
+        raise InvalidPayload(f"Invalid payload: {content}")
+    elif status_code >= 400:
+        if isinstance(response, HttpxResponse):
+            raise HTTPStatusError(
+                f"Status code {status_code}: {content}",
+                request=request,
+                response=response,
+            )
+        elif isinstance(response, RequestsResponse):
+            raise RequestsHTTPError(
+                f"Status code {status_code}: {content}", response=response
+            )
+        else:
+            raise Exception(f"Status code {status_code}: {content}")
 
 
 def serialize(obj):

nuclia/sdk/logs.py

@@ -1,11 +1,11 @@
 from nuclia.decorators import kb
-from nuclia.lib.kb import LogType, NucliaDBClient, AsyncNucliaDBClient
+from nuclia.lib.kb import NucliaDBClient, AsyncNucliaDBClient
 from nuclia_models.events.activity_logs import (  # type: ignore
     ActivityLogsQuery,
-    ActivityLogsChatQuery,
+    ActivityLogsAskQuery,
     ActivityLogsSearchQuery,
     DownloadActivityLogsQuery,
-    DownloadActivityLogsChatQuery,
+    DownloadActivityLogsAskQuery,
     DownloadActivityLogsSearchQuery,
     DownloadFormat,
     EventType,
@@ -25,23 +25,6 @@ WAIT_FOR_DOWNLOAD_TIMEOUT = 120
 
 
 class NucliaLogs:
-    @kb
-    def get(
-        self, *args, type: Union[LogType, str], month: str, **kwargs
-    ) -> list[list[str]]:
-        """
-        Download activity logs.
-
-        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, STARTED, STOPPED, PROCESSED
-        :param month: YYYY-MM
-        """
-        if isinstance(type, str):
-            type = LogType[type.upper()]
-
-        ndb: NucliaDBClient = kwargs["ndb"]
-        resp = ndb.logs(type=type, month=month)
-        return resp
-
     @kb
     def query(
         self,
@@ -51,25 +34,25 @@ class NucliaLogs:
             dict,
             ActivityLogsQuery,
             ActivityLogsSearchQuery,
-            ActivityLogsChatQuery,
+            ActivityLogsAskQuery,
         ],
         **kwargs,
     ) -> ActivityLogsOutput:
         """
         Query activity logs.
 
-        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, STARTED, STOPPED, PROCESSED
+        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, ASK, STARTED, STOPPED, PROCESSED
         :param query: ActivityLogsQuery
         """
         _type = EventType[type.upper()] if isinstance(type, str) else type
         _query: Union[
             ActivityLogsQuery,
             ActivityLogsSearchQuery,
-            ActivityLogsChatQuery,
+            ActivityLogsAskQuery,
         ]
         if isinstance(query, dict):
-            if _type is EventType.CHAT:
-                _query = ActivityLogsChatQuery.model_validate(query)
+            if _type in (EventType.ASK, EventType.CHAT):  # TODO: deprecate chat event
+                _query = ActivityLogsAskQuery.model_validate(query)
             elif type is EventType.SEARCH:
                 _query = ActivityLogsSearchQuery.model_validate(query)
             else:
@@ -95,7 +78,7 @@ class NucliaLogs:
             dict,
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ],
         download_format: Union[DownloadFormat, str],
         wait: bool = False,
@@ -104,8 +87,8 @@ class NucliaLogs:
         """
         Download activity logs.
 
-        :param type: SEARCH, CHAT, VISITED, MODIFIED, DELETED, NEW, STARTED, STOPPED, PROCESSED
-        :param type: NDJSON, CSV
+        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, ASK, STARTED, STOPPED, PROCESSED
+        :param download_format: NDJSON, CSV
         :param query: DownloadActivityLogsQuery
         """
         _type = EventType[type.upper()] if isinstance(type, str) else type
@@ -119,11 +102,11 @@ class NucliaLogs:
             dict,
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ]
         if isinstance(query, dict):
-            if _type is EventType.CHAT:
-                _query = DownloadActivityLogsChatQuery.model_validate(query)
+            if _type in (EventType.ASK, EventType.CHAT):  # TODO: deprecate chat event
+                _query = DownloadActivityLogsAskQuery.model_validate(query)
             elif type is EventType.SEARCH:
                 _query = DownloadActivityLogsSearchQuery.model_validate(query)
             else:
@@ -168,23 +151,6 @@ class NucliaLogs:
 
 
 class AsyncNucliaLogs:
-    @kb
-    async def get(
-        self, *args, type: Union[LogType, str], month: str, **kwargs
-    ) -> list[list[str]]:
-        """
-        Download activity logs.
-
-        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, STARTED, STOPPED, PROCESSED
-        :param month: YYYY-MM
-        """
-        if isinstance(type, str):
-            type = LogType[type.upper()]
-
-        ndb: AsyncNucliaDBClient = kwargs["ndb"]
-        resp = await ndb.logs(type=type, month=month)
-        return resp
-
     @kb
     async def query(
         self,
@@ -194,25 +160,25 @@ class AsyncNucliaLogs:
             dict,
             ActivityLogsQuery,
             ActivityLogsSearchQuery,
-            ActivityLogsChatQuery,
+            ActivityLogsAskQuery,
         ],
         **kwargs,
     ) -> ActivityLogsOutput:
         """
         Query activity logs.
 
-        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, STARTED, STOPPED, PROCESSED
+        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, ASK, STARTED, STOPPED, PROCESSED
         :param query: ActivityLogsQuery
         """
         _type = EventType[type.upper()] if isinstance(type, str) else type
         _query: Union[
             ActivityLogsQuery,
             ActivityLogsSearchQuery,
-            ActivityLogsChatQuery,
+            ActivityLogsAskQuery,
         ]
         if isinstance(query, dict):
-            if _type is EventType.CHAT:
-                _query = ActivityLogsChatQuery.model_validate(query)
+            if _type in (EventType.ASK, EventType.CHAT):  # TODO: deprecate chat event
+                _query = ActivityLogsAskQuery.model_validate(query)
             elif type is EventType.SEARCH:
                 _query = ActivityLogsSearchQuery.model_validate(query)
             else:
@@ -238,7 +204,7 @@ class AsyncNucliaLogs:
             dict,
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ],
         download_format: Union[DownloadFormat, str],
         wait: bool = False,
@@ -247,8 +213,8 @@ class AsyncNucliaLogs:
         """
         Download activity logs.
 
-        :param type: SEARCH, CHAT, VISITED, MODIFIED, DELETED, NEW, STARTED, STOPPED, PROCESSED
-        :param type: NDJSON, CSV
+        :param type: VISITED, MODIFIED, DELETED, NEW, SEARCH, SUGGEST, INDEXED, CHAT, ASK, STARTED, STOPPED, PROCESSED
+        :param download_format: NDJSON, CSV
         :param query: DownloadActivityLogsQuery
         """
         _type = EventType[type.upper()] if isinstance(type, str) else type
@@ -262,11 +228,11 @@ class AsyncNucliaLogs:
             dict,
             DownloadActivityLogsQuery,
             DownloadActivityLogsSearchQuery,
-            DownloadActivityLogsChatQuery,
+            DownloadActivityLogsAskQuery,
         ]
         if isinstance(query, dict):
-            if _type is EventType.CHAT:
-                _query = DownloadActivityLogsChatQuery.model_validate(query)
+            if _type in (EventType.ASK, EventType.CHAT):  # TODO: deprecate chat event
+                _query = DownloadActivityLogsAskQuery.model_validate(query)
             elif type is EventType.SEARCH:
                 _query = DownloadActivityLogsSearchQuery.model_validate(query)
             else:

nuclia/tests/test_kb/test_logs.py

@@ -1,24 +1,15 @@
 from nuclia.sdk.kb import NucliaKB, AsyncNucliaKB
 from nuclia.tests.fixtures import IS_PROD
-from nuclia.lib.kb import LogType
 from nuclia_models.events.activity_logs import (
     ActivityLogsQuery,
     Pagination,
     DownloadActivityLogsQuery,
     DownloadFormat,
+    EventType,
 )
 import pytest
 
 
-def test_logs(testing_config):
-    if not IS_PROD:
-        assert True
-        return
-    nkb = NucliaKB()
-    logs = nkb.logs.get(type=LogType.NEW, month="2024-06")
-    assert len(logs) == 23
-
-
 def test_activity_logs_query(testing_config):
     if not IS_PROD:
         assert True
@@ -30,7 +21,7 @@ def test_activity_logs_query(testing_config):
         pagination=Pagination(limit=10),
     )
     nkb = NucliaKB()
-    output = nkb.logs.query(type=LogType.CHAT, query=query)
+    output = nkb.logs.query(type=EventType.CHAT, query=query)
     assert len(output.data) == 10
     assert output.has_more
 
@@ -46,24 +37,48 @@ def test_activity_logs_download(testing_config):
     )
     nkb = NucliaKB()
     output = nkb.logs.download(
-        type=LogType.CHAT, query=query, download_format=DownloadFormat.NDJSON
+        type=EventType.CHAT, query=query, download_format=DownloadFormat.NDJSON
     )
     assert output.request_id
     assert output.download_url is None
 
 
 @pytest.mark.asyncio
-async def test_logs_async(testing_config):
+async def test_activity_logs_query_async(testing_config):
     if not IS_PROD:
         assert True
         return
+    query = ActivityLogsQuery(
+        year_month="2024-10",
+        show=["id", "date", "client_type", "total_duration"],
+        filters={},
+        pagination=Pagination(limit=10),
+    )
     nkb = AsyncNucliaKB()
-    logs = await nkb.logs.get(type=LogType.NEW, month="2024-06")
-    assert len(logs) == 23
+    output = await nkb.logs.query(type=EventType.CHAT, query=query)
+    assert len(output.data) == 10
+    assert output.has_more
 
 
 @pytest.mark.asyncio
-async def test_activity_logs_query_async(testing_config):
+async def test_activity_logs_download_async(testing_config):
+    if not IS_PROD:
+        assert True
+        return
+    query = DownloadActivityLogsQuery(
+        year_month="2024-10",
+        show=["id", "date", "client_type", "total_duration"],
+        filters={},
+    )
+    nkb = AsyncNucliaKB()
+    output = await nkb.logs.download(
+        type=EventType.CHAT, query=query, download_format=DownloadFormat.NDJSON
+    )
+    assert output.request_id
+    assert output.download_url is None
+
+
+def test_activity_logs_ask_query(testing_config):
     if not IS_PROD:
         assert True
         return
@@ -73,14 +88,14 @@ async def test_activity_logs_query_async(testing_config):
         filters={},
         pagination=Pagination(limit=10),
     )
-    nkb = AsyncNucliaKB()
-    output = await nkb.logs.query(type=LogType.CHAT, query=query)
+    nkb = NucliaKB()
+    output = nkb.logs.query(type=EventType.ASK, query=query)
     assert len(output.data) == 10
     assert output.has_more
 
 
 @pytest.mark.asyncio
-async def test_activity_logs_download_async(testing_config):
+async def test_activity_logs_ask_download_async(testing_config):
     if not IS_PROD:
         assert True
         return
@@ -91,7 +106,7 @@ async def test_activity_logs_download_async(testing_config):
     )
     nkb = AsyncNucliaKB()
     output = await nkb.logs.download(
-        type=LogType.CHAT, query=query, download_format=DownloadFormat.NDJSON
+        type=EventType.ASK, query=query, download_format=DownloadFormat.NDJSON
     )
     assert output.request_id
     assert output.download_url is None

{nuclia-4.8.8.dist-info → nuclia-4.8.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nuclia
-Version: 4.8.8
+Version: 4.8.10
 Summary: Nuclia Python SDK
 Author-email: Nuclia <info@nuclia.com>
 License-Expression: MIT
@@ -26,7 +26,7 @@ Requires-Dist: httpcore>=1.0.0
 Requires-Dist: prompt_toolkit
 Requires-Dist: nucliadb_sdk<7,>=6.4
 Requires-Dist: nucliadb_models<7,>=6.4
-Requires-Dist: nuclia-models>=0.38.1
+Requires-Dist: nuclia-models>=0.41.1
 Requires-Dist: tqdm
 Requires-Dist: aiofiles
 Requires-Dist: backoff

{nuclia-4.8.8.dist-info → nuclia-4.8.10.dist-info}/RECORD

@@ -9,12 +9,12 @@ nuclia/cli/run.py,sha256=B1hP0upSbSCqqT89WAwsd93ZxkAoF6ajVyLOdYmo8fU,1560
 nuclia/cli/utils.py,sha256=iZ3P8juBdAGvaRUd2BGz7bpUXNDHdPrC5p876yyZ2Cs,1223
 nuclia/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/lib/conversations.py,sha256=M6qhL9NPEKroYF767S-Q2XWokRrjX02kpYTzRvZKwUE,149
-nuclia/lib/kb.py,sha256=98zpJ8Dp4rQYMNKm4nhpOms3PY-PFOd8acNgDmBud-o,31819
+nuclia/lib/kb.py,sha256=jV-L8-a5oFVHIbFfeGO17hXf2IQk9UuW-9fq5D3LO6Y,28508
 nuclia/lib/models.py,sha256=lO3TZa4jTQ6C8ptGO1oX-5pxDgv8ocO13z7j5jXOC0Y,1554
 nuclia/lib/nua.py,sha256=sUVFdCjvLigTqUUhILywdHpiC0qKCtKPABn5kUXfuxQ,27064
 nuclia/lib/nua_chat.py,sha256=ApL1Y1FWvAVUt-Y9a_8TUSJIhg8-UmBSy8TlDPn6tD8,3874
 nuclia/lib/nua_responses.py,sha256=9WRGpvvhA2ZOyOv9kzX1zI7C3ypM8ySqciVYCSibUjo,12724
-nuclia/lib/utils.py,sha256=XAVRRICPem-qOIEcssqDuv-vqD-9PICk6Iuj6DK5GKk,4808
+nuclia/lib/utils.py,sha256=9l6DxBk-11WqUhXRn99cqeuVTUOJXj-1S6zckal7wOk,6312
 nuclia/sdk/__init__.py,sha256=-nAw8i53XBdmbfTa1FJZ0FNRMNakimDVpD6W4OdES-c,1374
 nuclia/sdk/accounts.py,sha256=7XQ3K9_jlSuk2Cez868FtazZ05xSGab6h3Mt1qMMwIE,647
 nuclia/sdk/agent.py,sha256=ot_oA4yi7TkXahPnhcRIxztq9Dtskc85-A57WN1BNGg,1961
@@ -24,7 +24,7 @@ nuclia/sdk/export_import.py,sha256=y5cTOxhILwRPIvR2Ya12bk-ReGbeDzA3C9TPxgnOHD4,9
 nuclia/sdk/kb.py,sha256=iDJimbzw_R9VeUu7a4F5wXoLdLxCim7W3UeEaAQ5dGI,26820
 nuclia/sdk/kbs.py,sha256=nXEvg5ddZYdDS8Kie7TrN-s1meU9ecYLf9FlT5xr-ro,9131
 nuclia/sdk/logger.py,sha256=UHB81eS6IGmLrsofKxLh8cmF2AsaTj_HXP0tGqMr_HM,57
-nuclia/sdk/logs.py,sha256=P7PJwrSfJMTJqykWZZm9yhtWtIODZYvPqsaStKoPnmo,10400
+nuclia/sdk/logs.py,sha256=3jfORpo8fzZiXFFSbGY0o3Bre1ZgJaKQCXgxP1keNHw,9614
 nuclia/sdk/nua.py,sha256=6t0m0Sx-UhqNU2Hx9v6vTwy0m3a30K4T0KmP9G43MzY,293
 nuclia/sdk/nucliadb.py,sha256=bOESIppPgY7IrNqrYY7T3ESoxwttbOSTm5zj1xUS1jI,1288
 nuclia/sdk/predict.py,sha256=KF7iT2aasaB9DIEAwqktXbOl2H_Y_ne-6-SEErN7YOk,9095
@@ -44,7 +44,7 @@ nuclia/tests/test_kb/test_conversation.py,sha256=L__KMBucqChPGeYR_XwXl7Elt4LDlp1
 nuclia/tests/test_kb/test_export_import.py,sha256=lQEww2jFNHZYcudFJqcHhoWAPrmtvvnPvcFqrijxLbo,1019
 nuclia/tests/test_kb/test_graph.py,sha256=PQSdqvPvOHr71pfdbUpsAK-_DxBQh7spxtJaaleF87A,1434
 nuclia/tests/test_kb/test_labels.py,sha256=IUdTq4mzv0OrOkwBWWy4UwKGKyJybtoHrgvXr676vyY,961
-nuclia/tests/test_kb/test_logs.py,sha256=Iw0v-R5QLlfHKxL8roPeOQKjTylgpYgot0wG4vsXQTE,2609
+nuclia/tests/test_kb/test_logs.py,sha256=Z9ELtiiU9NniITJzeWt92GCcERKYy9Nwc_fUVPboRU0,3121
 nuclia/tests/test_kb/test_remi.py,sha256=OX5N-MHbgcwpLg6fBjrAK_KhqkMspJo_VKQHCBCayZ8,2080
 nuclia/tests/test_kb/test_resource.py,sha256=05Xgmg5fwcPW2PZKnUSSjr6MPXp5w8XDgx8plfNcR68,1102
 nuclia/tests/test_kb/test_search.py,sha256=bsQhfB6-NYFwY3gqkrVJJnru153UgZqEhV22ho4VeWM,4660
@@ -61,9 +61,9 @@ nuclia/tests/test_nucliadb/test_crud.py,sha256=GuY76HRvt2DFaNgioKm5n0Aco1HnG7zzV
 nuclia/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/unit/test_export_import.py,sha256=xo_wVbjUnNlVV65ZGH7LtZ38qy39EkJp2hjOuTHC1nU,980
 nuclia/tests/unit/test_nua_responses.py,sha256=t_hIdVztTi27RWvpfTJUYcCL0lpKdZFegZIwLdaPNh8,319
-nuclia-4.8.8.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
-nuclia-4.8.8.dist-info/METADATA,sha256=EI0YpmuSdlgl0IM4hDq9C0DJSW7mgmFoIzYz2KQh-Qo,2337
-nuclia-4.8.8.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-nuclia-4.8.8.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
-nuclia-4.8.8.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
-nuclia-4.8.8.dist-info/RECORD,,
+nuclia-4.8.10.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
+nuclia-4.8.10.dist-info/METADATA,sha256=Vcg3SQFhjDTSZ9akWQevdKqRVZyt8ModTnX5BcwgmsI,2338
+nuclia-4.8.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nuclia-4.8.10.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
+nuclia-4.8.10.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
+nuclia-4.8.10.dist-info/RECORD,,

{nuclia-4.8.8.dist-info → nuclia-4.8.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any