vysion 2.0.10__tar.gz → 2.0.12__tar.gz

{vysion-2.0.10 → vysion-2.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vysion
-Version: 2.0.10
+Version: 2.0.12
 Summary: The official Python client library for Vysion
 Home-page: https://vysion.ai
 License: Apache-2.0
@@ -25,11 +25,11 @@ Description-Content-Type: text/markdown
 
 # Vysion-PY
 
-Welcome to the open source repository for vysion-py, our implementation as a Python library to use the Vysion tool. Vysion is a dark web intelligence tool that provides information collected from web pages from Tor, I2P, cybercrime forums on the clearnet, etc. Vysion API also provides a feed of information on ransomware attacks published by the various ransomware groups currently active.
+Welcome to the PyPi webpage for Vysion, our implementation as a Python library to use the Vysion tool. Vysion is a dark web intelligence tool that provides information collected from web pages from Tor, I2P, cybercrime forums on the clearnet, etc. Vysion API also provides a feed of information on ransomware attacks published by the various ransomware groups currently active.
 
 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.0.10](https://pypi.org/project/vysion/)
+Latest version: [2.0.12](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.0.10 → vysion-2.0.12}/README.md

@@ -1,10 +1,10 @@
 # Vysion-PY
 
-Welcome to the open source repository for vysion-py, our implementation as a Python library to use the Vysion tool. Vysion is a dark web intelligence tool that provides information collected from web pages from Tor, I2P, cybercrime forums on the clearnet, etc. Vysion API also provides a feed of information on ransomware attacks published by the various ransomware groups currently active.
+Welcome to the PyPi webpage for Vysion, our implementation as a Python library to use the Vysion tool. Vysion is a dark web intelligence tool that provides information collected from web pages from Tor, I2P, cybercrime forums on the clearnet, etc. Vysion API also provides a feed of information on ransomware attacks published by the various ransomware groups currently active.
 
 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.0.10](https://pypi.org/project/vysion/)
+Latest version: [2.0.12](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.0.10 → vysion-2.0.12}/pyproject.toml

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

{vysion-2.0.10 → vysion-2.0.12}/vysion/client/client.py

@@ -38,6 +38,7 @@ from vysion.dto import (
     ImChannelHit,
     ImMessageHit,
     ImProfileHit,
+    ImServerHit,
 )
 from vysion.version import __version__ as vysion_version
 
@@ -392,22 +393,27 @@ class Client(BaseClient):
     @vysion_error_manager
     def search_im(
         self,
-        platform: str,
-        q: str,
+        platform: str = None,
+        q: str = None,
         gte: datetime = None,
         lte: datetime = None,
         page: int = 1,
+        page_size: int = 10,
         username: str = None,
     ) -> VysionResponse[ImMessageHit]:
         url = self._build_api_url__(
-            "im/" + platform + "/search",
+            "im/search",
+            platform=platform,
             q=q,
             gte=gte,
             lte=lte,
             page=page,
+            page_size=page_size,
             username=username,
         )
 
+        print(url)
+
         result = VysionResponse[ImMessageHit].model_validate(self._make_request(url))
         return result.data
 
@@ -448,6 +454,15 @@ class Client(BaseClient):
 
         result = VysionResponse[ImChannelHit].model_validate(self._make_request(url))
         return result.data
+    
+    @vysion_error_manager
+    def get_im_server(
+        self, platform: str, serverId: str
+    ) -> VysionResponse[ImServerHit]:
+        url = self._build_api_url__("im/" + platform + "/server/", serverId)
+
+        result = VysionResponse[ImServerHit].model_validate(self._make_request(url))
+        return result.data
 
     #
     # FEEDS

{vysion-2.0.10 → vysion-2.0.12}/vysion/dto/dto.py

@@ -287,10 +287,10 @@ class LanguagePair(BaseModel):
 
 
 class ImMessageHit(BaseModel):
-    userId: Optional[int] = Field(default_factory=lambda: None)
+    userId: Optional[Union[int, str]] = Field(default_factory=lambda: None)
     username: Optional[str] = Field(default_factory=lambda: None)
-    channelId: Optional[int] = Field(default_factory=lambda: None)
-    messageId: str
+    channelId: Optional[Union[int, str]] = Field(default_factory=lambda: None)
+    messageId: Union[int, str]
     message: Optional[str] = Field(default_factory=lambda: None)
     channelTitle: Optional[str] = Field(default_factory=lambda: None)
     languages: Optional[List[LanguagePair]] = Field(default_factory=lambda: None)
@@ -298,38 +298,25 @@ class ImMessageHit(BaseModel):
     sha256sum: Optional[str] = None
     media: Optional[str] = Field(default_factory=lambda: None)
     detectionDate: datetime
-    serverId: Optional[int] = Field(default_factory=lambda: None) #Discord Exclusive
+    serverId: Optional[Union[int, str]] = Field(default_factory=lambda: None) #Discord Exclusive
     serverTitle: Optional[str] = Field(default_factory=lambda: None) #Discord Exclusive
     platform: Optional[str] = Field(default_factory=lambda: None) #Discord Exclusive
-
-    @field_validator("messageId")
-    def validate_messageId(cls, v: int) -> int:
-        if not v:
-            raise ValueError("MessageId field cannot be empty")
-        return v
     
 class ImMessageCardHit(BaseModel):
-    userId: Optional[int] = Field(default_factory=lambda: None)
+    userId: Optional[Union[int, str]] = Field(default_factory=lambda: None)
     username: Optional[str] = Field(default_factory=lambda: None)
     channelId: Optional[int] = Field(default_factory=lambda: None)
-    messageId: str
+    messageId: Union[int, str]
     message: Optional[str] = Field(default_factory=lambda: None)
     channelTitle: Optional[str] = Field(default_factory=lambda: None)
     languages: Optional[List[LanguagePair]] = Field(default_factory=lambda: None)
     detectionDate: datetime
-    serverId: Optional[int] = Field(default_factory=lambda: None) #Discord Exclusive
+    serverId: Optional[Union[int, str]] = Field(default_factory=lambda: None) #Discord Exclusive
     serverTitle: Optional[str] = Field(default_factory=lambda: None) #Discord Exclusive
     platform: Optional[str] = Field(default_factory=lambda: None)
 
-    @field_validator("messageId")
-    def validate_messageId(cls, v: int) -> int:
-        if not v:
-            raise ValueError("MessageId field cannot be empty")
-        return v
-
-
 class ImProfileHit(BaseModel):
-    userId: int
+    userId: Union[int, str]
     usernames: Optional[List[str]] = Field(default_factory=lambda: None)
     firstName: Optional[List[str]] = Field(default_factory=lambda: None)
     lastName: Optional[List[str]] = Field(default_factory=lambda: None)
@@ -338,6 +325,7 @@ class ImProfileHit(BaseModel):
     bot: Optional[bool] = Field(default_factory=lambda: None) #Discord Exclusive
     discordLink: Optional[List[str]] = Field(default_factory=lambda: None) #Discord Exclusive
     discriminator: Optional[List[int]] = Field(default_factory=lambda: None) #Discord Exclusive
+    platform: Optional[str] = Field(default_factory=lambda: None)
     
     @field_validator("userId")
     def validate_userId(cls, v: int) -> int:
@@ -353,20 +341,15 @@ class ImProfileHit(BaseModel):
 
 
 class ImChannelHit(BaseModel):
-    channelId: int
+    channelId: Union[int, str]
     channelTitles: Optional[List[str]] = Field(default_factory=lambda: None)
     detectionDate: datetime
     creationDate: datetime
     channelPhoto: Optional[List[str]] = Field(default_factory=lambda: None) #Telegram Exclusive
-    serverId: Optional[int] = Field(default_factory=lambda: None) #Discord Exclusive
+    serverId: Optional[Union[int, str]] = Field(default_factory=lambda: None) #Discord Exclusive
     serverTitle: Optional[List[str]] = Field(default_factory=lambda: None) #Discord Exclusive
-
-    @field_validator("channelId")
-    def validate_channelId(cls, v: int) -> int:
-        if not v:
-            raise ValueError("channelId field cannot be empty")
-        return v
-
+    platform: Optional[str] = Field(default_factory=lambda: None)
+    
     @field_validator("detectionDate")
     def validate_detectionDate(cls, v: datetime) -> datetime:
         if not v:
@@ -380,7 +363,7 @@ class ImChannelHit(BaseModel):
         return v
 
 class ImServerHit(BaseModel):
-    serverId: int
+    serverId: Union[int, str]
     serverTitles: Optional[List[str]] = Field(default_factory=lambda: None)
     detectionDate: datetime
     creationDate: datetime
@@ -388,12 +371,6 @@ class ImServerHit(BaseModel):
     memberCount: Optional[int] = Field(default_factory=lambda: None)
     discordLink: Optional[List[str]] = Field(default_factory=lambda: None)
 
-    @field_validator("serverId")
-    def validate_channelId(cls, v: int) -> int:
-        if not v:
-            raise ValueError("serverId field cannot be empty")
-        return v
-
     @field_validator("detectionDate")
     def validate_detectionDate(cls, v: datetime) -> datetime:
         if not v:

{vysion-2.0.10 → vysion-2.0.12}/vysion/version.py

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