Dispatch option on gunicorn version

[mvdbeek]

dev is now using a gunicorn version below 25.1.0, so this flag doesn't exist

[nsoranzo]

How I didn't think about that? 🙄

What about checking the gunicorn version?

diff --git a/gravity/state.py b/gravity/state.py
index deb96e7..7aa7e1c 100644
--- a/gravity/state.py
+++ b/gravity/state.py
@@ -104,6 +104,19 @@ class ConfigFile(BaseModel):
                 exec(fh.read(), {}, locs)
                 return locs["VERSION"]
 
+    @property
+    def gunicorn_version(self):
+        if galaxy_installed:
+            from gunicorn import __version__
+            return __version__
+        else:
+            galaxy_requirements_file = os.path.join(self.galaxy_root, "requirements.txt")
+            with open(galaxy_requirements_file) as fh:
+                for line in fh:
+                    if line.startswith("gunicorn=="):
+                        return line.split("==")[1].strip()
+            raise RuntimeError("gunicorn version not found in Galaxy requirements.txt")
+
     @field_validator("galaxy_root", mode="after")
     def _galaxy_root_required(cls, value: Optional[str], info: ValidationInfo) -> Optional[str]:
         if value is None:
@@ -317,7 +330,7 @@ class GalaxyGunicornService(Service):
     def command_template(self):
         template = self._command_template
         try:
-            if Version(self.config.galaxy_version) >= Version("26.1.0.dev0"):
+            if Version(self.config.gunicorn_version) >= Version("25.1.0"):
                 template += " --no-control-socket"
         except Exception:
             pass

[mvdbeek]

gravity doesn't need to be installed in same venv, so I think this would be a step back in the isolation and goals we set out for gravity initially ... but maybe that's ok ?

[nsoranzo]

gravity doesn't need to be installed in same venv, so I think this would be a step back in the isolation and goals we set out for gravity initially ... but maybe that's ok ?

It uses the same pattern of the galaxy_version property.

[mvdbeek]

Which does this:

    @property
    def galaxy_version(self):
        if galaxy_installed:
            return galaxy.version.VERSION
        else:
            assert self.galaxy_root is not None
            galaxy_version_file = os.path.join(self.galaxy_root, "lib", "galaxy", "version.py")
            with open(galaxy_version_file) as fh:
                locs: Dict[str, Any] = {}
                exec(fh.read(), {}, locs)
                return locs["VERSION"]

where galaxy_installed is:

try:
    import galaxy.version
    galaxy_installed = True
except ImportError:
    galaxy_installed = False

so that doesn't require same env

[mvdbeek]

I should start reading the diff to the end ...

[nsoranzo]

Looks great 😆