PyWSGIRef 1.1.16__tar.gz → 1.1.18__tar.gz

{pywsgiref-1.1.16/src/PyWSGIRef.egg-info → pywsgiref-1.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.16
+Version: 1.1.18
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander.kafemann+python@icloud.com>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyWSGIRef"
-version = "1.1.16"
+version = "1.1.18"
 authors = [
   {name="Leander Kafemann", email="leander.kafemann+python@icloud.com" },
 ]

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/src/PyWSGIRef/__init__.py

@@ -18,7 +18,7 @@ def about():
     """
     Returns information about your release and other projects by Leander Kafemann
     """
-    return {"Version": (1, 1, 16), "Author": "Leander Kafemann", "date": "05.09.2025",\
+    return {"Version": (1, 1, 18), "Author": "Leander Kafemann", "date": "08.11.2025",\
             "recommend": ("pyimager"), "feedbackTo": "leander.kafemann+python@icloud.com"}
 
 SCHABLONEN = TemplateDict()
@@ -34,7 +34,8 @@ def addSchablone(name: str, content: str):
     SCHABLONEN[name] = PyHTML(content)
 
 def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool = False, setAdvancedHeaders: bool = False,\
-                          getIP: bool = False, vercelPythonHosting: bool = False, getStats: bool = False) -> Callable:
+                          getIP: bool = False, vercelPythonHosting: bool = False, getStats: bool = False,
+                          advancedStats: bool = False, customEncoding: bool = False) -> Callable:
     """
     Returns a WSGI application object based on your contentGeneratingFunction.
     The contentGeneratingFunction should take a single argument (the path) and return the content as a string.
@@ -43,6 +44,8 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
     If getIP is True, the contentGeneratingFunction will receive the IP address of the client as an additional argument.
     If vercelPythonHosting is True, your application object will be optimized for Vercel's unusual WSGI methods.
     If getStats is True, stats are saved in the STATS object (BETA).
+    If advancedStats is True, more detailed stats are collected (BETA).
+    If customEncoding is True, the contentGeneratingFunction has to encode the content itself.
     Locks BETA mode.
     """
     if not callable(contentGeneratingFunction):
@@ -57,10 +60,12 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
                 raise BetaNotEnabledError()
             STATS.count.increase()
             perfTime = STATS.startPerfTime("applicationCallNr"+str(STATS.count.count))
+        storage = FieldStorage(fp=environ.get("wsgi.input"), environ=environ, keep_blank_values=True)
+        if storage.getvalue("realAccessDeviceMonitorAgent", "") not in ["PyWSGIRef/1.1", ""]:
+            raise OutdatedPyWSGIRefVersionError("Access with outdated PyWSGIRef version detected. Please update to the latest version.")
         type_ = "text/html" 
         status = "200 OK"
         if advanced:
-            storage = FieldStorage(fp=environ.get("wsgi.input"), environ=environ, keep_blank_values=True)
             if setAdvancedHeaders:
                 if getIP:
                     content, type_, status = contentGeneratingFunction(environ["PATH_INFO"], storage, environ["HTTP_X_REAL_IP"])
@@ -79,13 +84,20 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
             else:
                 content = contentGeneratingFunction(environ["PATH_INFO"])
         headers = [("Content-Type", type_),
-                   ("Content-Length", str(len(content))),
+                   ("Content-Length", str(len(content if not customEncoding else content[0]))),
                    ('Access-Control-Allow-Origin', '*')]
         start_response(status, headers)
         if getStats:
             STATS.stopPerfTime(perfTime)
+            perfTime.data["ip"] = environ.get("HTTP_X_REAL_IP", "unknown")
+            perfTime.data["path"] = environ.get("PATH_INFO", "unknown")
         if not vercelPythonHosting:
+            if customEncoding:
+                return content
             return [content.encode("utf-8")]
+        else:
+            if customEncoding:
+                raise VercelIncompabilityError("customEncoding cannot be used with vercelPythonHosting.")
     return simpleApplication
 
 def setUpServer(application: Callable, port: int = 8000) -> WSGIServer:

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/src/PyWSGIRef/exceptions.py

@@ -84,5 +84,21 @@ class BetaNotEnabledError(Exception):
     Raised when trying to use a BETA feature when BETA mode is not enabled.
     """
     def __init__(self, message="BETA mode is not enabled."):
+        self.message = message
+        super().__init__(self.message)
+
+class VercelIncompabilityError(Exception):
+    """
+    Raised when trying to use Vercel hosting without enabling Vercel compatibility.
+    """
+    def __init__(self, message="Vercel compatibility is not enabled."):
+        self.message = message
+        super().__init__(self.message)
+
+class OutdatedPyWSGIRefVersionError(Exception):
+    """
+    Raised when the PyWSGIRef version is outdated and does not support a requested feature.
+    """
+    def __init__(self, message="The PyWSGIRef version is outdated and does not support this feature."):
         self.message = message
         super().__init__(self.message)

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/src/PyWSGIRef/loadContent.py

@@ -6,18 +6,19 @@ import requests
 from .exceptions import *
 from .finished import finished
 
-def loadFromWeb(url: str) -> str:
+def loadFromWeb(url: str, overrideException: bool = False) -> str:
     """
     Loads content from the given URL with the given data.
+    Overrides ServerAlreadyGeneratedError if overrideException is True.
     """
-    if finished.value:
+    if finished.value and not overrideException:
         raise ServerAlreadyGeneratedError()
     if not url.endswith(".pyhtml"):
         raise InvalidFiletypeError()
 
     # trick GitHub Pages guardian
-    headers = {"User-Agent": "Mozilla/5.0", "realAccessDeviceMonitorAgent": "PyWSGIRef/1.1"}
-    rq = requests.get(url, headers=headers)
+    headers = {"User-Agent": "Mozilla/5.0"}
+    rq = requests.get(url, headers=headers, data={"realAccessDeviceMonitorAgent": "PyWSGIRef/1.1"})
     if rq.status_code != 200:
         raise AccessToTemplateForbidden()
     rq_content = rq.content

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/src/PyWSGIRef/pyhtml.py

@@ -20,7 +20,7 @@ class PyHTML:
         if self.html.startswith(EVAL_PYHTML):
             self.html = START_REPLACE + self.html[len(EVAL_PYHTML):]
         if self.html.endswith(EVAL_PYHTML):
-            self.html = self.html[:-len(EVAL_PYHTML)-1] + END_REPLACE
+            self.html = self.html[:-len(EVAL_PYHTML)] + END_REPLACE
 
     def _replace_modern_styling(self):
         """

{pywsgiref-1.1.16 → pywsgiref-1.1.18}/src/PyWSGIRef/stats.py

@@ -1,9 +1,10 @@
 import datetime
 
 class PerformanceTime:
-    def __init__(self, title: str):
+    def __init__(self, title: str, data: dict = {}):
         self.start = datetime.datetime.now()
         self.title = title
+        self.data = data
     def stop(self):
         self.end = datetime.datetime.now()
 
@@ -29,10 +30,11 @@ class Stats:
         perfTime.stop()
         self.performanceTimes.append(perfTime)
 
-    def export_stats(self, filename: str = None) -> str:
+    def export_stats(self, filename: str = None, html: bool = True) -> str:
         """
         Exports all current stats as a formatted string.
         If filename is given, it will also save the stats to that file.
+        If html is true, the output will be formatted as HTML.
         """
         lines = []
         lines.append("PyWSGIRef Statistic-Export")
@@ -54,7 +56,8 @@ class Stats:
                     lines.append(f"  {i}. {title}: started at {start} (not stopped until now)")
                 else:
                     lines.append(f"  {i}. {title}: (no time data)")
-        result = "\n".join(lines)
+                lines[-1] = lines[-1] + " data: " + ", ".join(f"{k}={v}" for k, v in perf.data.items())
+        result = "\n".join(lines) if not html else "<br>".join(lines)
         if filename:
             if not filename.endswith(".pywsgirefstats"):
                 filename += ".pywsgirefstats"

{pywsgiref-1.1.16 → pywsgiref-1.1.18/src/PyWSGIRef.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.16
+Version: 1.1.18
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander.kafemann+python@icloud.com>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef

pywsgiref-1.1.18/tests/testMainServer.py

@@ -0,0 +1,3 @@
+from PyWSGIRef.simpleServer import *
+
+main()

pywsgiref-1.1.16/tests/testMainServer.py

@@ -1,3 +0,0 @@
-from PyWSGIRef import *
-
-main()