vysion 2.2.1__tar.gz → 2.2.2__tar.gz

{vysion-2.2.1 → vysion-2.2.2}/PKG-INFO

@@ -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 → vysion-2.2.2}/README.md

@@ -4,7 +4,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 → vysion-2.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vysion"
-version = "2.2.1"
+version = "2.2.2"
 description = "The official Python client library for Vysion"
 homepage = "https://vysion.ai"
 repository = "https://github.com/ByronLabs/vysion-py"

{vysion-2.2.1 → vysion-2.2.2}/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-2.2.1 → vysion-2.2.2}/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-2.2.1 → vysion-2.2.2}/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"