polyswarm-engine 3.2.0__tar.gz → 3.2.1__tar.gz

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: polyswarm_engine
-Version: 3.2.0
+Version: 3.2.1
 Summary: Polyswarm engine libarary
 Author-email: Polyswarm Developers <developers@polyswarm.io>
 Project-URL: Homepage, https://github.com/polyswarm/polyswarm_engine
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: celery
 Requires-Dist: click
@@ -12,6 +12,7 @@ Requires-Dist: click-log
 Requires-Dist: python-json-logger
 Requires-Dist: requests
 Provides-Extra: tests
+Requires-Dist: pathlib3x; python_version < "3.10" and extra == "tests"
 Requires-Dist: flake8; extra == "tests"
 Requires-Dist: isort; extra == "tests"
 Requires-Dist: mypy; extra == "tests"

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine/__init__.py

@@ -1,5 +1,5 @@
 # flake8: noqa
-__VERSION__ = '3.2.0'
+__VERSION__ = '3.2.1'
 
 from .bidutils import (
     bid_max,

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine/backend.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import contextlib
 import logging
 import typing as t
@@ -9,7 +10,12 @@ import celery
 
 from polyswarm_engine import exceptions
 from polyswarm_engine.bounty import get_bounty_expiration, get_bounty_tasked_at, CANNOT_FETCH
-from polyswarm_engine.settings import PSENGINE_METADATA_ARCHTECTURE, PSENGINE_METADATA_OS, PSENGINE_DELIVERY_TASK
+from polyswarm_engine.settings import (
+    PSENGINE_METADATA_ARCHTECTURE,
+    PSENGINE_METADATA_OS,
+    PSENGINE_DELIVERY_TASK,
+    PSENGINE_DISCARD_EXPIRED_BOUNTIES,
+)
 from polyswarm_engine.constants import (
     BENIGN,
     MALICIOUS,
@@ -245,11 +251,12 @@ class CeleryBackend:
         expiration = get_bounty_expiration(bounty)
         processing_start = datetime.now(timezone.utc)
         if processing_start > expiration:
-            raise exceptions.EngineTimeoutError(
-                'Current time %s is past expiration time %s',
-                processing_start.isoformat(),
-                expiration.isoformat(),
-            )
+            if PSENGINE_DISCARD_EXPIRED_BOUNTIES.upper() in ('1', 'YES', 'TRUE'):
+                raise exceptions.EngineTimeoutError(
+                    'Current time %s is past expiration time %s',
+                    processing_start.isoformat(),
+                    expiration.isoformat(),
+                )
 
         try:
             result = self._analyze(bounty)

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine/bidutils.py

@@ -44,7 +44,21 @@ def rescale_to_bid(bounty: 'Bounty', value: 't.SupportsInt', min=0, max=100) ->
 
 
 def dni_to_bid(bounty: 'Bounty', value: str) -> 'Bid':
-    """Transform string value from the None / Low / Med / High scale to a bid"""
+    """Transform string value from the None / Low / Med / High scale to a bid
+
+    From: https://www.dni.gov/files/documents/ICD/ICD_203_TA_Analytic_Standards_21_Dec_2022.pdf
+
+    | DNI Scale                               | Polyswarm Bid |
+    |-----------------------------------------+---------------|
+    | Not Specified                           | Not Specified |
+    | Almost No Chance / Remote               |             5 |
+    | Very Unlikely / Highly Improbable       |            15 |
+    | Unlikely / Improbable                   |            30 |
+    | Roughly Even Chance / Roughly Even Odds |            50 |
+    | Likely / Probable                       |            70 |
+    | Very Likely / Highly Probable           |            85 |
+    | Almost Certain / Nearly Certain         |            95 |to appropriate bid amounts.
+    """
     value = value.lower()
 
     if value == "none":

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine/settings.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import platform
 import shutil
@@ -39,3 +40,6 @@ PSENGINE_TASK_ALWAYS_EAGER: bool = bool(int(os.getenv('PSENGINE_TASK_ALWAYS_EAGE
 #: Name of the Celery task that processes the delivery of assertions and votes.
 # If empty, fallback to doing the delivery directly via HTTP
 PSENGINE_DELIVERY_TASK = os.getenv('PSENGINE_DELIVERY_TASK', '')
+
+#: Turn on (set as 1) to discard bounties arrived after the expiration.
+PSENGINE_DISCARD_EXPIRED_BOUNTIES = os.getenv('PSENGINE_DISCARD_EXPIRED_BOUNTIES', '')

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: polyswarm_engine
-Version: 3.2.0
+Version: 3.2.1
 Summary: Polyswarm engine libarary
 Author-email: Polyswarm Developers <developers@polyswarm.io>
 Project-URL: Homepage, https://github.com/polyswarm/polyswarm_engine
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: celery
 Requires-Dist: click
@@ -12,6 +12,7 @@ Requires-Dist: click-log
 Requires-Dist: python-json-logger
 Requires-Dist: requests
 Provides-Extra: tests
+Requires-Dist: pathlib3x; python_version < "3.10" and extra == "tests"
 Requires-Dist: flake8; extra == "tests"
 Requires-Dist: isort; extra == "tests"
 Requires-Dist: mypy; extra == "tests"

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/polyswarm_engine.egg-info/requires.txt

@@ -12,6 +12,9 @@ pytest>=7.0
 types-requests
 yapf
 
+[tests:python_version < "3.10"]
+pathlib3x
+
 [web]
 flask
 gunicorn

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/pyproject.toml

@@ -1,16 +1,16 @@
 [build-system]
-requires = ["setuptools>=80"]
+requires = ["setuptools>=70"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyswarm_engine"
-version = "3.2.0"
+version = "3.2.1"
 description = "Polyswarm engine libarary"
 readme = "README.md"
 authors = [
     {name = "Polyswarm Developers", email = "developers@polyswarm.io"},
 ]
-requires-python = ">=3.10,<4"
+requires-python = ">=3.8,<4"
 dependencies = [
     "celery",
     "click",
@@ -24,6 +24,7 @@ Homepage = "https://github.com/polyswarm/polyswarm_engine"
 
 [project.optional-dependencies]
 tests = [
+    "pathlib3x; python_version < '3.10'",
     "flake8",
     "isort",
     "mypy",
@@ -98,3 +99,24 @@ split_before_dot = "true"
 
 [tool.setuptools]
 include-package-data = false
+
+[tool.bumpversion]
+current_version = "3.2.1"
+commit = true
+tag = false
+sign_tags = true
+tag_name = "{new_version}"
+parse = '^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:\.dev(?P<dev>\d+))?(?:\+(?P<local>[a-z0-9]+(?:\.[a-z0-9]+)*))?$'
+serialize = [
+  "{major}.{minor}.{patch}.dev{dev}+{short_commit_sha}",
+  "{major}.{minor}.{patch}"
+]
+
+[tool.bumpversion.parts.dev]
+first_value = "0"
+optional_value = "0"
+
+[[tool.bumpversion.files]]
+filename = "polyswarm_engine/__init__.py"
+search = "__VERSION__ = '{current_version}'"
+replace = "__VERSION__ = '{new_version}'"

{polyswarm_engine-3.2.0 → polyswarm_engine-3.2.1}/tests/test_bounty.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
 import contextlib
 import io
-import pathlib
+try:
+    import pathlib3x as pathlib
+except ImportError:
+    import pathlib
 import sys
 
 import pytest