PyWSGIRef 1.1.11__tar.gz → 1.1.13__tar.gz

{pywsgiref-1.1.11/src/PyWSGIRef.egg-info → pywsgiref-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.11
+Version: 1.1.13
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -159,6 +159,9 @@ just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and
 PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
 You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
 <code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.<br/><br/>
+You may add your own static resources like CSS or JavaScript files using the <code><{{evalPyHTML-include: ... :include-}}></code> phrase.<br/>
+Different static resources can be included by separating them with a comma.<br/>
+You may include CSS, JS, JSON and ICO files.<br/><br/>
 With the <code><{{evalPyHTML-script: alert('Hello, World!'); :script-}}></code> phrase,<br/>
 you can add a script block anywhere inside your PyHTML file.<br/>
 Using pretty much the same syntax, you can also add a style block using
@@ -193,8 +196,7 @@ BETA.enable()
 ```
 Currently to be tested are:<br/>
 - PyHTML python script blocks<br/>
-- PyHTML python if clause blocks<br/>
-- PyHTML include static resource blocks<br/><br/>
+- PyHTML python if clause blocks<br/><br/>
 
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/README.md

@@ -142,6 +142,9 @@ just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and
 PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
 You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
 <code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.<br/><br/>
+You may add your own static resources like CSS or JavaScript files using the <code><{{evalPyHTML-include: ... :include-}}></code> phrase.<br/>
+Different static resources can be included by separating them with a comma.<br/>
+You may include CSS, JS, JSON and ICO files.<br/><br/>
 With the <code><{{evalPyHTML-script: alert('Hello, World!'); :script-}}></code> phrase,<br/>
 you can add a script block anywhere inside your PyHTML file.<br/>
 Using pretty much the same syntax, you can also add a style block using
@@ -176,8 +179,7 @@ BETA.enable()
 ```
 Currently to be tested are:<br/>
 - PyHTML python script blocks<br/>
-- PyHTML python if clause blocks<br/>
-- PyHTML include static resource blocks<br/><br/>
+- PyHTML python if clause blocks<br/><br/>
 
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyWSGIRef"
-version = "1.1.11"
+version = "1.1.13"
 authors = [
   {name="Leander Kafemann", email="leander@kafemann.berlin" },
 ]

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/src/PyWSGIRef/__init__.py

@@ -17,8 +17,8 @@ def about():
     """
     Returns information about your release and other projects by Leander Kafemann
     """
-    return {"Version": (1, 1, 11), "Author": "Leander Kafemann", "date": "25.06.2025",\
-            "recommend": ("Buero by LK",  "pyimager by LK"), "feedbackTo": "leander@kafemann.berlin"}
+    return {"Version": (1, 1, 13), "Author": "Leander Kafemann", "date": "13.08.2025",\
+            "recommend": ("Buero by LK",  "pyimager by LK"), "feedbackTo": "update-bot@lk.kafemann.berlin"}
 
 SCHABLONEN = TemplateDict()
 
@@ -31,12 +31,13 @@ def addSchablone(name: str, content: str):
         raise ServerAlreadyGeneratedError()
     SCHABLONEN[name] = PyHTML(content)
 
-def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool = False, setAdvancedHeaders: bool = False) -> Callable:
+def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool = False, setAdvancedHeaders: bool = False, getIP: 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.
     If advanced is True, the contentGeneratingFunction will receive a FieldStorage object as the second argument.
     If setAdvancedHeaders is True, it will allow you to set advanced headers for the response.
+    If getIP is True, the contentGeneratingFunction will receive the IP address of the client as an additional argument.
     """
     if not callable(contentGeneratingFunction):
         raise InvalidCallableError()
@@ -49,13 +50,22 @@ def makeApplicationObject(contentGeneratingFunction: Callable, advanced: bool =
         if advanced:
             storage = FieldStorage(fp=environ.get("wsgi.input"), environ=environ, keep_blank_values=True)
             if setAdvancedHeaders:
-                content, type_, status = contentGeneratingFunction(environ["PATH_INFO"], storage)
+                if getIP:
+                    content, type_, status = contentGeneratingFunction(environ["PATH_INFO"], storage, environ["HTTP_X_REAL_IP"])
+                else:
+                    content, type_, status = contentGeneratingFunction(environ["PATH_INFO"], storage)
             else:
-                content = contentGeneratingFunction(environ["PATH_INFO"], storage)
+                if getIP:
+                    content = contentGeneratingFunction(environ["PATH_INFO"], storage, environ["HTTP_X_REAL_IP"])
+                else:
+                    content = contentGeneratingFunction(environ["PATH_INFO"], storage)
         else:
             if setAdvancedHeaders:
                 raise AdvancedHeadersWithoutAdvancedModeError()
-            content = contentGeneratingFunction(environ["PATH_INFO"])
+            if getIP:
+                content = contentGeneratingFunction(environ["PATH_INFO"], environ["HTTP_X_REAL_IP"])
+            else:
+                content = contentGeneratingFunction(environ["PATH_INFO"])
         headers = [("Content-Type", type_),
                    ("Content-Length", str(len(content))),
                    ('Access-Control-Allow-Origin', '*')]

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/src/PyWSGIRef/exceptions.py

@@ -60,5 +60,13 @@ class BetaAlreadyEnabledError(BooleanAlreadyTrueError):
     Raised when trying to enable beta mode that is already enabled.
     """
     def __init__(self, message="Beta mode is already enabled."):
+        self.message = message
+        super().__init__(self.message)
+
+class AccessToTemplateForbidden(Exception):
+    """
+    Raised when trying to access a template that is not allowed.
+    """
+    def __init__(self, message="Access to this template is forbidden."):
         self.message = message
         super().__init__(self.message)

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/src/PyWSGIRef/loadContent.py

@@ -6,7 +6,7 @@ import requests
 from .exceptions import *
 from .finished import finished
 
-def loadFromWeb(url: str, data: dict = {}) -> str:
+def loadFromWeb(url: str) -> str:
     """
     Loads content from the given URL with the given data.
     """
@@ -14,8 +14,14 @@ def loadFromWeb(url: str, data: dict = {}) -> str:
         raise ServerAlreadyGeneratedError()
     if not url.endswith(".pyhtml"):
         raise InvalidFiletypeError()
-    rq = requests.post(url, data).content
-    return rq.decode()
+
+    # trick GitHub Pages guardian
+    headers = {"User-Agent": "Mozilla/5.0", "realAccessDeviceMonitorAgent": "PyWSGIRef/1.1"}
+    rq = requests.get(url, headers=headers)
+    if rq.status_code != 200:
+        raise AccessToTemplateForbidden()
+    rq_content = rq.content
+    return rq_content.decode()
 
 def loadFromFile(filename: str) -> str:
     """

{pywsgiref-1.1.11 → pywsgiref-1.1.13}/src/PyWSGIRef/pyhtml.py

@@ -127,8 +127,8 @@ class PyHTML:
         self._replace_modern_styling()
         self._replace_script_blocks()
         self._replace_style_blocks()
+        self._replace_includes()
         if BETA.value:
-            self._replace_includes()
             self._replace_eval_blocks()
             self._replace_if_blocks()
 

{pywsgiref-1.1.11 → pywsgiref-1.1.13/src/PyWSGIRef.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.11
+Version: 1.1.13
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -159,6 +159,9 @@ just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and
 PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
 You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
 <code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.<br/><br/>
+You may add your own static resources like CSS or JavaScript files using the <code><{{evalPyHTML-include: ... :include-}}></code> phrase.<br/>
+Different static resources can be included by separating them with a comma.<br/>
+You may include CSS, JS, JSON and ICO files.<br/><br/>
 With the <code><{{evalPyHTML-script: alert('Hello, World!'); :script-}}></code> phrase,<br/>
 you can add a script block anywhere inside your PyHTML file.<br/>
 Using pretty much the same syntax, you can also add a style block using
@@ -193,8 +196,7 @@ BETA.enable()
 ```
 Currently to be tested are:<br/>
 - PyHTML python script blocks<br/>
-- PyHTML python if clause blocks<br/>
-- PyHTML include static resource blocks<br/><br/>
+- PyHTML python if clause blocks<br/><br/>
 
 Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon