hyperflask 0.4.1__tar.gz → 0.4.3__tar.gz

{hyperflask-0.4.1 → hyperflask-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.4.1
+Version: 0.4.3
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>

{hyperflask-0.4.1 → hyperflask-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.4.1"
+version = "0.4.3"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}

{hyperflask-0.4.1 → hyperflask-0.4.3}/src/hyperflask/app.py

@@ -114,8 +114,9 @@ class Hyperflask(Flask):
             })
             self.config.setdefault("HSTS_HEADER", "max-age=31556926; includeSubDomains") # 1 year
 
-        if (self.config['URL_FOR_SERVER_NAME'] or self.config.get('SERVER_NAME')) and not self.config.get('MERCURE_HUB_URL') and not self.config.get('MERCURE_PUBLIC_HUB_URL'):
-            self.config['MERCURE_PUBLIC_HUB_URL'] = True
+        if not self.debug and not self.testing and not self.config.get('MERCURE_HUB_URL'):
+            self.config['MERCURE_HUB_URL'] = "http://localhost:5300/.well-known/mercure"
+            self.config.setdefault('MERCURE_PUBLIC_HUB_URL', True)
 
         #self.otel = Observability(self)
 

{hyperflask-0.4.1 → hyperflask-0.4.3}/src/hyperflask/cli/runner.py

@@ -39,11 +39,12 @@ serve_command.params = flask_run_command.params + serve_command.params
 @click.option("--host", "-h", default="127.0.0.1", help="The interface to bind to.")
 @click.option("--port", "-p", default=5000, help="The port to bind to.")
 @click.option('--concurrency')
-@click.option("--extend-procfile")
+@click.option("--extend-procfile", is_flag=True)
 @click.option("--init-db/--no-init-db", is_flag=True, default=None)
 @click.option("--dev", is_flag=True)
 def run_command(processes, host, port, concurrency, extend_procfile, init_db, dev):
-    from honcho.command import _procfile, _parse_concurrency
+    from honcho.command import _parse_concurrency
+    from honcho.environ import parse_procfile
     from honcho.printer import Printer
     from honcho import environ
 
@@ -54,35 +55,41 @@ def run_command(processes, host, port, concurrency, extend_procfile, init_db, de
         print("Initializing database...")
         Popen([sys.argv[0], "db", "init"]).wait()
 
-    _processes = None
+    _processes = {}
+    procfile = None
     config = load_config()
+
     for filename in [f"Procfile.{config['ENV']}", "Procfile"]:
         if os.path.exists(filename):
-            _processes = _procfile(filename).processes
+            with open(filename) as f:
+                procfile = parse_procfile(f.read()).processes
             break
-    if _processes is None or extend_procfile:
-        if not _processes:
-            _processes = {}
-        _processes.update({
-            "web": [sys.argv[0], "serve", "--host", host, "--port", "$PORT"],
-            "worker": [sys.argv[0], "worker"],
-            "scheduler": [sys.argv[0], "scheduler"]
-        })
-        if dev:
-            _processes["assets"] = [sys.argv[0], "assets", "dev"]
-            _processes["worker"].extend(["-p", "1", "-t", "1"])
+
+    _processes = {
+        "web": [sys.argv[0], "serve", "--host", host, "--port", "$PORT"],
+        "worker": [sys.argv[0], "worker"],
+        "scheduler": [sys.argv[0], "scheduler"]
+    }
+    if dev:
+        _processes["assets"] = [sys.argv[0], "assets", "dev"]
+        _processes["worker"].extend(["-p", "1", "-t", "1"])
+    else:
+        _processes["mercurehub"] = [sys.executable, "-m", "flask_mercure_sse.server", "--port", "$PORT"]
+        subscriber_secret_key = config.get("MERCURE_SUBSCRIBER_SECRET_KEY", config.get('SECRET_KEY'))
+        if subscriber_secret_key:
+            _processes["mercurehub"].extend(["--subscriber-secret", subscriber_secret_key])
+        else:
+            print("Warning: No MERCURE_SUBSCRIBER_SECRET_KEY or SECRET_KEY set, Mercure subscriber will not be authenticated.")
+        publisher_secret_key = config.get("MERCURE_PUBLISHER_SECRET_KEY", config.get('SECRET_KEY'))
+        if publisher_secret_key:
+            _processes["mercurehub"].extend(["--publisher-secret", publisher_secret_key])
         else:
-            _processes["mercurehub"] = [sys.executable, "-m", "flask_mercure_sse.server"]
-            subscriber_secret_key = config.get("MERCURE_SUBSCRIBER_SECRET_KEY", config.get('SECRET_KEY'))
-            if subscriber_secret_key:
-                _processes["mercurehub"].extend(["--subscriber-secret", subscriber_secret_key])
-            else:
-                print("Warning: No MERCURE_SUBSCRIBER_SECRET_KEY or SECRET_KEY set, Mercure subscriber will not be authenticated.")
-            publisher_secret_key = config.get("MERCURE_PUBLISHER_SECRET_KEY", config.get('SECRET_KEY'))
-            if publisher_secret_key:
-                _processes["mercurehub"].extend(["--publisher-secret", publisher_secret_key])
-            else:
-                print("Warning: No MERCURE_PUBLISHER_SECRET_KEY or SECRET_KEY set, cannot publish Mercure messages.")
+            print("Warning: No MERCURE_PUBLISHER_SECRET_KEY or SECRET_KEY set, cannot publish Mercure messages.")
+
+    if procfile and extend_procfile:
+        _processes.update(procfile)
+    elif procfile:
+        _processes = procfile
 
     processes = {name: " ".join(_processes[name]) if isinstance(_processes[name], list) else _processes[name]
                  for name in _processes if not processes or name in processes}