diff --git a/flake.nix b/flake.nix index 94f5256..2096831 100644 --- a/flake.nix +++ b/flake.nix @@ -10,20 +10,50 @@ pkgs = import nixpkgs { system = "x86_64-linux"; }; lib = pkgs.lib; types = lib.types; + dependencies = [ + pkgs.python3 + pkgs.python3Packages.flask + pkgs.python3Packages.flask-socketio + pkgs.python3Packages.requests + pkgs.python3Packages.gunicorn + pkgs.python3Packages.eventlet + ]; in { - packages.x86_64-linux.default = pkgs.python3Packages.buildPythonApplication rec { + packages.x86_64-linux.default = pkgs.python3Packages.buildPythonPackage rec { pname = "ozai-webui"; version = "0.1.1"; - propagatedBuildInputs = [ pkgs.python3Packages.flask pkgs.python3Packages.flask-socketio pkgs.python3Packages.requests ]; + propagatedBuildInputs = dependencies; src = ./src; doCheck = false; - + postInstall = '' - mkdir -p $out/share/ozai-webui - cp -r static $out/share/ozai-webui/static - cp -r templates $out/share/ozai-webui/templates - mv $out/bin/main.py $out/bin/ozai-webui + mkdir -p $out/share/ozai-webui/static + mkdir -p $out/share/ozai-webui/templates + install -Dm444 ${src}/static/* $out/share/ozai-webui/static/ + install -Dm444 ${src}/templates/* $out/share/ozai-webui/templates/ + ''; + }; + + packages.x86_64-linux.ozai-webui-run = pkgs.stdenv.mkDerivation rec { + pname = "ozai-webui-run"; + version = "0.1.1"; + src = ./src; + + buildInputs = [ self.packages.x86_64-linux.default pkgs.python3Packages.gunicorn ]; + + installPhase = '' + mkdir -p $out/bin + echo 'gunicorn --worker-class eventlet -w 1 --chdir ${self.packages.x86_64-linux.default}/bin ozai_webui:app' > $out/bin/run + chmod +x $out/bin/run + ''; + }; + + devShells.x86_64-linux.default = pkgs.mkShell { + buildInputs = dependencies; + shellHook = '' + OZAI_WEBUI_STATIC_FOLDER=result/share/ozai-webui/static + OZAI_WEBUI_TEMPLATE_FOLDER=result/share/ozai-webui/templates ''; }; @@ -45,11 +75,6 @@ default = "http://localhost:8000/api/"; description = "The URL of the Ozai server"; }; - secretKey = lib.mkOption { - type = types.str; - default = "secret_key"; - description = "The secret key for the Flask app"; - }; }; config = lib.mkIf config.services.ozai-webui.enable { @@ -57,9 +82,30 @@ description = "Ozai WebUI server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${self.packages.x86_64-linux.default}/bin/ozai-webui --port ${toString config.services.ozai-webui.port} --host '${config.services.ozai-webui.host}' --ozai_url '${config.services.ozai-webui.ozaiUrl}' --secret_key '${config.services.ozai-webui.secretKey}' --static_folder '${self.packages.x86_64-linux.default}/share/ozai-webui/static' --template_folder '${self.packages.x86_64-linux.default}/share/ozai-webui/templates'"; + + + serviceConfig = + let + envFile = pkgs.writeText "ozai-webui-env" '' + OZAI_URL=${config.services.ozai-webui.ozaiUrl} + OZAI_WEBUI_HOST=${config.services.ozai-webui.host} + OZAI_WEBUI_PORT=${toString config.services.ozai-webui.port} + OZAI_WEBUI_STATIC_FOLDER=${self.packages.x86_64-linux.ozai-webui}/share/ozai-webui/static + OZAI_WEBUI_TEMPLATE_FOLDER=${self.packages.x86_64-linux.ozai-webui}/share/ozai-webui/templates + ''; + in + { + ExecStart = "${self.packages.x86_64-linux.ozai-webui-run}/bin/run"; Restart = "always"; + User = "ozai-webui"; + Group = "ozai-webui"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + EnvironmentFile = envFile; }; }; }; diff --git a/result b/result new file mode 120000 index 0000000..6976611 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/xhn74i71dp9fnn7yd5zd8cf05zdr9p82-python3.11-ozai-webui-0.1.1 \ No newline at end of file diff --git a/result-1 b/result-1 new file mode 120000 index 0000000..6976611 --- /dev/null +++ b/result-1 @@ -0,0 +1 @@ +/nix/store/xhn74i71dp9fnn7yd5zd8cf05zdr9p82-python3.11-ozai-webui-0.1.1 \ No newline at end of file diff --git a/src/main.py b/src/ozai_webui/__init__.py similarity index 85% rename from src/main.py rename to src/ozai_webui/__init__.py index 14b2318..e9b3217 100755 --- a/src/main.py +++ b/src/ozai_webui/__init__.py @@ -2,7 +2,7 @@ from flask import Flask, render_template, request from flask_socketio import SocketIO, join_room import requests -import argparse +#import argparse import os app = Flask(__name__) @@ -29,31 +29,31 @@ if os.getenv('OZAI_WEBUI_STATIC_FOLDER') is not None: if os.getenv('OZAI_WEBUI_TEMPLATE_FOLDER') is not None: template_folder = os.getenv('TEMPLATE_FOLDER') -parser = argparse.ArgumentParser(description="Run the Ozai WebUI server") - -parser.add_argument('-H', '--host', type=str, default=ozai_webui_host, help='The host to run the server on') -parser.add_argument('-P', '--port', type=int, default=ozai_webui_port, help='The port to run the server on') -parser.add_argument('-O', '--ozai_url', type=str, default=ozai_url, help='The URL of the Ozai server') -parser.add_argument('-S', '--secret_key', type=str, default=app.config['SECRET_KEY'], help='The secret key for the Flask app') -parser.add_argument('--static_folder', type=str, default=static_folder, help='The location of the static folder') -parser.add_argument('--template_folder', type=str, default=template_folder, help='The location of the template folder') - - -args = parser.parse_args() - -if args.host: - ozai_webui_host = args.host -if args.port: - ozai_webui_port = args.port -if args.ozai_url: - ozai_url = args.ozai_url -if args.secret_key: - app.config['SECRET_KEY'] = args.secret_key -if args.static_folder: - app.static_folder = args.static_folder -if args.template_folder: - app.template_folder = args.template_folder - +#parser = argparse.ArgumentParser(description="Run the Ozai WebUI server") +# +#parser.add_argument('-H', '--host', type=str, default=ozai_webui_host, help='The host to run the server on') +#parser.add_argument('-P', '--port', type=int, default=ozai_webui_port, help='The port to run the server on') +#parser.add_argument('-O', '--ozai_url', type=str, default=ozai_url, help='The URL of the Ozai server') +#parser.add_argument('-S', '--secret_key', type=str, default=app.config['SECRET_KEY'], help='The secret key for the Flask app') +#parser.add_argument('--static_folder', type=str, default=static_folder, help='The location of the static folder') +#parser.add_argument('--template_folder', type=str, default=template_folder, help='The location of the template folder') +# +# +#args = parser.parse_args() +# +#if args.host: +# ozai_webui_host = args.host +#if args.port: +# ozai_webui_port = args.port +#if args.ozai_url: +# ozai_url = args.ozai_url +#if args.secret_key: +# app.config['SECRET_KEY'] = args.secret_key +#if args.static_folder: +# app.static_folder = args.static_folder +#if args.template_folder: +# app.template_folder = args.template_folder +# #home page @app.route('/') @@ -210,7 +210,9 @@ def ws_message(data): #send message to the player that the move was invalid socketio.emit('move_status', response.text, room=game_id) - -if __name__ == '__main__': +def main (): # app.run(debug=True, host='0.0.0.0', port=5000,ssl_context='adhoc') socketio.run(app, debug=False, host=ozai_webui_host, port=ozai_webui_port, allow_unsafe_werkzeug=True) + +if __name__ == '__main__': + main() diff --git a/src/result b/src/result new file mode 120000 index 0000000..dd014d1 --- /dev/null +++ b/src/result @@ -0,0 +1 @@ +/nix/store/ldv1rcfs9phhh7hh2wzcvn2600dvgw4y-python3.11-ozai-webui-0.1.1 \ No newline at end of file diff --git a/src/setup.py b/src/setup.py index 2f916d4..73d791f 100644 --- a/src/setup.py +++ b/src/setup.py @@ -6,6 +6,8 @@ requires = ( "flask", "flask-socketio", "requests", + "gunicorn", + "eventlet", ) @@ -17,9 +19,16 @@ setup( name='ozai-webui', version='0.1.1', author = "Adrian Gunnar Lauterer", - packages=find_packages(), - scripts=["main.py"], + packages=find_packages("."), + #scripts=["ozai_webui.py"], + #scripts={"ozai_webui:main": "ozai_webui"}, + entry_points = { + "console_scripts": [ + "ozai-webui = ozai_webui:main" + ] + }, install_requires=requires, + #package_dir= {'':'src'}, package_data={ '': ['templates/*.html', 'static/*.*'], },