vysion 2.2.1__py3-none-any.whl → 2.2.2__py3-none-any.whl

vysion/client/client.py

@@ -30,6 +30,7 @@ from vysion.dto import (
     ErrorCode,
     DocumentHit,
     VysionResponse,
+    VysionPaginationResponse,
     RansomwareHit,
     Stat,
     Network,
@@ -39,7 +40,6 @@ from vysion.dto import (
     ImProfileHit,
     ImServerHit,
     LeakHit,
-    ImChatMessages,
 )
 from vysion.version import __version__ as vysion_version
 
@@ -518,7 +518,7 @@ class Client(BaseClient):
         messageId: str | None,
         cursor: str | None,
         limit: str = 30
-    ) -> ImChatMessages:
+    ) -> VysionPaginationResponse:
         url = self._build_api_url__(
             "im/" + platform + "/chat/" + channelId,
             messageId=messageId,
@@ -526,7 +526,7 @@ class Client(BaseClient):
             limit=limit
         )
 
-        result = VysionResponse[ImChatMessages].model_validate(self._make_request(url))
+        result = VysionPaginationResponse.model_validate(self._make_request(url))
         return result.data
 
     @vysion_error_manager

vysion/dto/dto.py

@@ -411,13 +411,6 @@ class ImProfileHit(BaseModel):
             raise ValueError("DetectionDate field cannot be empty")
         return v
 
-
-class ImChatMessages(BaseModel):
-    messages: List[ImMessageHit]
-    prev_cursor: Optional[str] = None
-    next_cursor: Optional[str] = None
-
-
 class ImChannelHit(BaseModel):
     channelId: Union[int, str]
     channelTitles: Optional[List[str]] = Field(default_factory=lambda: None)
@@ -734,6 +727,31 @@ class Result(BaseModel, Generic[T]):
 
         return data
 
+class ResultPagination(BaseModel, Generic[T]):
+    total: int = 0
+    hits: List[T] = Field(default_factory=lambda: [])
+    prev_cursor: Optional[str] = None
+    next_cursor: Optional[str] = None
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        if self.total <= 0:
+            self.total = len(self.hits)
+
+    def get_type(self) -> type:
+        if len(self.hits) <= 0:
+            return NoneType
+
+        return type(self.hits[0])
+
+    @model_validator(mode="before")
+    @classmethod
+    def check_hits(cls, data):
+        hits = data.get("hits")
+        if not isinstance(hits, list):
+            raise ValueError("hits must be a list")
+
+        return data
 
 class ErrorCode(int, Enum):
     BAD_REQUEST = 400
@@ -765,3 +783,8 @@ class Error(BaseModel):
 class VysionResponse(BaseModel, Generic[T]):
     data: Optional[Result[T]] = None
     error: Optional[Error] = None
+
+
+class VysionPaginationResponse(BaseModel, Generic[T]):
+    data: Optional[ResultPagination[T]] = None
+    error: Optional[Error] = None

vysion/version.py

@@ -15,4 +15,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"

{vysion-2.2.1.dist-info → vysion-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vysion
-Version: 2.2.1
+Version: 2.2.2
 Summary: The official Python client library for Vysion
 Home-page: https://vysion.ai
 License: Apache-2.0
@@ -29,7 +29,7 @@ Welcome to the PyPi webpage for Vysion, our implementation as a Python library t
 
 You can request a demo for the web app or an API-key to use in this library at [vysion.ai](https://vysion.ai).
 
-Latest version: [2.2.1](https://pypi.org/project/vysion/)
+Latest version: [2.2.2](https://pypi.org/project/vysion/)
 
 You can visit [the documentation](https://developers.vysion.ai/?python) for more information on the searches and requests performed with the library or directly on the API.
 

{vysion-2.2.1.dist-info → vysion-2.2.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 vysion/__init__.py,sha256=yxJiM-S29q8GB3PBff9tV70P2nvydd8aKLEprLkXw5o,664
 vysion/client/__init__.py,sha256=aVHmBuetPdybp7TgcNzUx4HkxTjEuXYzSdDYiYfFQd0,630
-vysion/client/client.py,sha256=YmawH7ZVbMYMhjQX1LYaY6nnvzVpCACTnWun9PM7Cn8,24102
+vysion/client/client.py,sha256=c2MCYNE_-Cyb9Z9skyM-KDHv-d2fVtvki8NGdXfVd70,24116
 vysion/client/error.py,sha256=JK0dsZkyMjmxPtEgO5IStG_N_q8y_-VGbppwWrUtSgM,1166
 vysion/dto/__init__.py,sha256=ct8JxVMfJ0APiOTgr9ju-JIuBlXOrPkx7n2qISSXUts,605
-vysion/dto/dto.py,sha256=KhsyVty8FHk6qwhnuowBIre2C0at9n63H0AYO-zOCHE,26784
+vysion/dto/dto.py,sha256=mCGkxk2_aSV9brb6TCETu9TZ9nxFJdyGS2yCv7cKIJI,27467
 vysion/dto/tag.py,sha256=whGPsdasgYm8oijrL7MRSMmapzaoCmKNeaJ5ih0aBIk,1503
 vysion/dto/util.py,sha256=AxdMWPdf7xrFtWva5epKxgjI0Bah1GiIw-sEWvIUYb4,4491
 vysion/model/__init__.py,sha256=rJX9eNW9-jQGTgwm97W04jhZa-dV_dSTTTFcbWg73w0,606
@@ -15,8 +15,8 @@ vysion/model/enum/services.py,sha256=fUfZEO0RNNctU4Gzae5TV3c7BU5A_cEwaEb1tzqgcr0
 vysion/taxonomy/__init__.py,sha256=Bc364AYxRCyjIn26-XBPeEDCPe3Hma4r5RAI8R8eblU,635
 vysion/taxonomy/flavours.py,sha256=ubImHBE8v0zhzFy_2YozAQk2SzN1XDQwHAxb2RebtCo,2347
 vysion/taxonomy/taxonomy.py,sha256=mG6vHX5Eyp38AKyJBgfBDqdpEmDMbkv8TA8YUBzko54,12227
-vysion/version.py,sha256=xLiCsKYJ8-o-U3jLZrcs1fVnnAAzX-xT-HZaBGqdvKo,610
-vysion-2.2.1.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-vysion-2.2.1.dist-info/METADATA,sha256=o6FnxIDlQB0RbqEllP6lZ7rlEohqlx9dXAjhCSDmpD8,1958
-vysion-2.2.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-vysion-2.2.1.dist-info/RECORD,,
+vysion/version.py,sha256=GFkDndghv1jT8gLTuKSLD9wMWvCEgxC1PMCQaOXzq4c,610
+vysion-2.2.2.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+vysion-2.2.2.dist-info/METADATA,sha256=tFEiYQx8cav3c_1J0DLYhquPCvwqOqX5Qt3frqqdPqU,1958
+vysion-2.2.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+vysion-2.2.2.dist-info/RECORD,,