Merge pull request #4 from Never-Over/fixes-celery-render

Fixes for Celery on Render [0.0.20]

Author: emdoyle

bridge/cli/init/templates/render__yaml.py

@@ -10,6 +10,8 @@
     envVars:
       - key: BRIDGE_PLATFORM
         value: render
+      - key: BRIDGE_PROJECT_NAME
+        value: {service_name}
       - key: SECRET_KEY
         generateValue: true
       - key: WEB_CONCURRENCY
@@ -37,6 +39,8 @@
     envVars:
       - key: BRIDGE_PLATFORM
         value: render
+      - key: BRIDGE_PROJECT_NAME
+        value: {service_name}
       - key: SECRET_KEY
         generateValue: true
       - key: TASK_CONCURRENCY

bridge/framework/django.py

@@ -53,7 +53,7 @@ def configure_allowed_hosts(self, platform: Platform) -> None:
                 log_warning(
                     "ALLOWED_HOSTS already configured and non-empty; overwriting configuration."
                 )
-            self.framework_locals["ALLOWED_HOSTS"] = ["*.onrender.com", "localhost"]
+            self.framework_locals["ALLOWED_HOSTS"] = [".onrender.com", "localhost"]
 
     def configure_debug(self, platform: Platform) -> None:
         if platform != Platform.LOCAL:

bridge/service/celery.py

@@ -1,11 +1,21 @@
+# NOTE: This file is used in both local and remote environments.
+#   resolve_project_dir() is not guaranteed to work in remote environments,
+#   so the project_name can be set by an environment variable.
+
 import os
 
 from celery import Celery
 
 from bridge.utils.filesystem import resolve_project_dir
 
 # Discover the correct project name
-project_name = resolve_project_dir().name
+if "BRIDGE_PROJECT_NAME" in os.environ:
+    # For remote environments, the project name is set by the environment
+    # since our strategy of reading the current working directory may not work
+    project_name = os.environ["BRIDGE_PROJECT_NAME"]
+else:
+    # For local environments, we can resolve the project directory by looking at cwd
+    project_name = resolve_project_dir().name
 
 # Set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", f"{project_name}.settings")

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-bridge"
-version = "0.0.19"
+version = "0.0.20"
 authors = [
   { name="Caelean Barnes", email="[email protected]" },
   { name="Evan Doyle", email="[email protected]" },