Beef up Mathics3Server for 10.0.0 release

Author: rocky

CHANGES.rst

@@ -14,6 +14,7 @@ Supports Python 3.14. Python 3.10 support dropped. Python 3.10 may still work, b
 * Supports mathics-threejs-backend 1.3.3 (fixes a bug in point size handling) and three.js r184
 * Support for production ASGI server via Daphne
 * Reduce javascript console warnings
+* Mathics3Server command-line program added to run Django manage.py
 
 
 9.0.0

README.rst

@@ -67,38 +67,41 @@ From the place root directory where GitHub was checked out::
 Running
 -------
 
-This is a Django project, so Django's `manage.py <https://docs.djangoproject.com/en/3.2/ref/django-admin/>`_ script is used.
+This is a Django project, so Django's `manage.py <https://docs.djangoproject.com/en/6.0/ref/django-admin/>`_ script is used.
 
-A simple way to start Mathics3 Django when GNU make is installed (which is the case on most POSIX systems):
+To start the webserver:
 
 ::
 
-   make runserver
+   Mathics3Server
 
 This runs the server in development mode. Here, when changes to the source code are made, the running server detects them and reloads the modified source.
 
 To run Mathics3 Django in production mode and you have the Django ASGI server `Daphne <https://pypi.org/project/daphne/>`_ installed, run::
 
-   make runserver-production
+   Mathics3Server --production
 
-In either case, this runs the Python program ``manage.py`` in ``mathics_django`` directory.
+To get a list of the available Django commands, type::
 
-To get a list of the available commands, type::
+   Mathics3Server help
 
-   python  mathics_django/manage.py help
+will show options for running the Django server.
 
-To get help on a specific command, give that command at the end. For example, two useful commands are the ``runserver`` and ``testserver`` commands::
+To get help on a specific Django command, give that command at the end. For example, two useful commands are the ``runserver`` and ``testserver`` commands::
 
    python mathics_django/manage.py help runserver
 
-will show options for running the Django server.
+To get a list of the available options for the Mathics3 Webserver, type::
+
+   Mathics3Server --help
 
-Once the server is started, you will see a URL listed that looks like this::
+Once the server is started, you will see a URL listed that might look like this::
 
-   Starting development server at http://127.0.0.1:8000/
+   ...
+   Starting development server at http://localhost:8000/
    Quit the server with CONTROL-C.
 
-Point your browser to the URL listed above. Here it is ``http://127.0.0.1:8000``
+Point your browser to the URL listed above. Here it is ``http://localhost:8000``
 
 Environment Variables
 +++++++++++++++++++++

mathics_django/manage.py

@@ -1,16 +1,80 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import argparse
 import os
 import sys
 
 from django.core.management import execute_from_command_line
 
 
 def main():
+    """
+    Runs the Mathics3 Webserver with supplied options.
+    """
+    # Process options
+    parser = argparse.ArgumentParser(
+        prog="Mathics3Server", description="Run the Mathics3 Django webserver."
+    )
+    parser.add_argument(
+        "--debug", action="store_true", help="Set DEBUG to True in settings"
+    )
+    parser.add_argument(
+        "--production", action="store_true", help="Run with Daphne production server"
+    )
+    parser.add_argument(
+        "-p",
+        "--port",
+        type=str,
+        default="8000",
+        help="Port to listen on (default: 8000)",
+    )
+    parser.add_argument(
+        "-b",
+        "--host",
+        type=str,
+        default="localhost",
+        help="The host address to listen on (default: localhost)",
+    )
+
+    # Use parse_known_args so we don't crash on standard Django commands (like 'runserver')
+    # If --help or -h is given in sys.argv, this will print help and exit immediately.
+    args, unknown = parser.parse_known_args()
+
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mathics_django.settings")
-    if len(sys.argv) == 1:
-        sys.argv.append("runserver")
-    execute_from_command_line(sys.argv)
+
+    # Handle --debug option
+    if args.debug:
+        # This overrides settings at runtime by setting an environment variable
+        # Ensure your mathics_django/settings.py reads DEBUG from the environment
+        os.environ["DEBUG"] = "True"
+
+    # Handle --production ption
+    if args.production:
+        try:
+            # Import and call Daphne's CLI directly
+            from daphne.cli import CommandLineInterface
+
+            # The run() method expects a list of arguments starting with the application path
+            # Equivalent to: daphne -b args.port -p args.host mathics_django.asgi:application
+            CommandLineInterface().run(
+                ["mathics_django.asgi:application", "-b", args.host, "-p", args.port]
+            )
+            return  # Exit after server stops
+        except ImportError:
+            print(
+                "Error: 'daphne' is not installed. Run 'pip install daphne' for production mode."
+            )
+            sys.exit(1)
+
+    # Fallback to standard Django execution, defaulting to "runserver" commands
+    # if --production not provided
+    django_args = [sys.argv[0]] + unknown
+
+    # If no command is provided, default to runserver with our port and bind address
+    if not unknown:
+        django_args.extend(["runserver", f"{args.host}:{args.port}"])
+
+    execute_from_command_line(django_args)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -55,7 +55,7 @@ production = [
 
 
 [project.scripts]
-Mathics3server = "mathics_django.manage:main"
+Mathics3Server = "mathics_django.manage:main"
 
 [project.urls]
 Homepage = "https://mathics.org/"