webtoolkit 0.1.66__tar.gz → 0.1.68__tar.gz

{webtoolkit-0.1.66 → webtoolkit-0.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: webtoolkit
-Version: 0.1.66
+Version: 0.1.68
 Summary: Web tools and interfaces for Internet data processing.
 License: GPL3
 Author: Iwan Grozny
@@ -12,8 +12,9 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: beautifulsoup4 (>=4.13.5,<5.0.0)
-Requires-Dist: brutefeedparser (>=0.10.5,<0.11.0)
+Requires-Dist: brutefeedparser (>=1.0.0,<2.0.0)
 Requires-Dist: lxml (>=5.4.0,<6.0.0)
 Requires-Dist: psutil
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)

{webtoolkit-0.1.66 → webtoolkit-0.1.68}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "webtoolkit"
-version = "0.1.66"
+version = "0.1.68"
 description = "Web tools and interfaces for Internet data processing."
 authors = ["Iwan Grozny <renegat@renegat0x0.ddns.net>"]
 license = "GPL3"
@@ -15,7 +15,7 @@ python-dateutil = "^2.8.2"
 tldextract = "^5.1.2"
 beautifulsoup4 = "^4.13.5"
 lxml = "^5.4.0"
-brutefeedparser="^0.10.5"
+brutefeedparser="^1.0.0"
 pytz = "^2024.2"
 psutil="*"
 url-cleaner="*"

{webtoolkit-0.1.66 → webtoolkit-0.1.68}/webtoolkit/remoteserver.py

@@ -192,7 +192,7 @@ class RemoteServer(object):
             print(str(E))
             return
 
-        if "success" in json_obj and not json_obj["success"]:
+        if json_obj and "success" in json_obj and not json_obj["success"]:
             print("Url:{} Remote error. Not a success".format(link_call))
             return
         return json_obj

{webtoolkit-0.1.66 → webtoolkit-0.1.68}/webtoolkit/request.py

@@ -34,6 +34,7 @@ class PageRequestObject(object):
         respect_robots=None,
         accept_types=None,
         bytes_limit=None,
+        freshness_interval_s=None, # seconds
         http_proxy=None,
         https_proxy=None,
         settings=None,
@@ -54,6 +55,7 @@ class PageRequestObject(object):
         self.respect_robots = respect_robots
         self.accept_types = accept_types
         self.bytes_limit = bytes_limit
+        self.freshness_interval_s = freshness_interval_s
         self.http_proxy = http_proxy
         self.https_proxy = https_proxy
         self.settings = settings
@@ -125,6 +127,8 @@ class PageRequestObject(object):
             return False
         if self.bytes_limit != other.bytes_limit:
             return False
+        if self.freshness_interval_s != other.freshness_interval_s:
+            return False
         if self.http_proxy != other.http_proxy:
             return False
         if self.https_proxy != other.https_proxy:
@@ -176,6 +180,8 @@ def request_to_json(request):
         json["accept_types"] = request.accept_types
     if request.bytes_limit is not None:
         json["bytes_limit"] = request.bytes_limit
+    if request.freshness_interval_s is not None:
+        json["freshness_interval_s"] = request.freshness_interval_s
     if request.http_proxy is not None:
         json["http_proxy"] = request.http_proxy
     if request.https_proxy is not None:
@@ -233,6 +239,7 @@ def json_to_request(json_data):
     request.bytes_limit = json_data.get("bytes_limit")
     if request.bytes_limit is not None:
         request.bytes_limit = int(request.bytes_limit)
+    request.freshness_interval_s = json_data.get("freshness_interval_s")
     request.http_proxy = json_data.get("http_proxy")
     request.https_proxy = json_data.get("https_proxy")
     request.settings = json_data.get("settings")