Flake now works

Author: MysaaJava

flake.nix

@@ -7,19 +7,45 @@
 
   outputs = { self, nixpkgs }: let
       pkgs = import nixpkgs {system = "x86_64-linux";};
+      sdow-website = pkgs.buildNpmPackage {
+        name = "sdow";
+        buildInputs = with pkgs; [
+          nodejs_latest
+        ];
+        src = ./website;
+
+        npmDeps = pkgs.importNpmLock {
+          npmRoot = ./website;
+        };
+
+        npmFlags = [ "--legacy-peer-deps" ];
+
+        npmConfigHook = pkgs.importNpmLock.npmConfigHook;
+
+        installPhase = ''
+          cp -r ./dist/ $out
+        '';
+      };
+      sdow-http = pkgs.writeShellScript "sdow" ''
+        ${pkgs.simple-http-server}/bin/simple-http-server ${self.packages.x86_64-linux.sdow} "$@"
+      '';
       python-gunicorn = pkgs.python3.withPackages (pp: with pp;[
         flask
         flask-compress
         flask-cors
         gunicorn
         protobuf
         requests
+        google-cloud-logging
       ]);
       sdow-api-gunicorn = pkgs.writeShellApplication {
         name = "sdow-api";
         runtimeInputs = [ python-gunicorn ];
         text = ''
           cd "${self.packages.x86_64-linux.sdow-api}"
+          if [ "$#" -lt 2 ]
+          then echo "This script takes two arguments: path to sdow database, and path to searches database"; exit 1
+          fi
           if [ ! -f "$1" ]
           then echo "First argument should be a path to the sdow database"; exit 1
           fi
@@ -63,25 +89,7 @@
 
     packages.x86_64-linux =  {
       default = self.packages.x86_64-linux.sdow;
-      sdow = pkgs.buildNpmPackage {
-        name = "sdow";
-        buildInputs = with pkgs; [
-          nodejs_latest
-        ];
-        src = ./website;
-
-        npmDeps = pkgs.importNpmLock {
-          npmRoot = ./website;
-        };
-
-        npmFlags = [ "--legacy-peer-deps" ];
-
-        npmConfigHook = pkgs.importNpmLock.npmConfigHook;
-
-        installPhase = ''
-          cp -r build/ $out
-        '';
-      };
+      sdow = sdow-website;
 
       sdow-api = pkgs.stdenv.mkDerivation {
         name = "sdow-api";
@@ -95,6 +103,10 @@
     };
     apps.x86_64-linux = {
       default = self.apps.x86_64-linux.sdow-api;
+      sdow = {
+        type = "app";
+        program = "${sdow-http}";
+      };
       sdow-api = {
         type = "app";
         program = "${sdow-api-gunicorn}/bin/sdow-api";

sdow/database.py

@@ -5,8 +5,8 @@
 import os.path
 import sqlite3
 
-import sdow.helpers as helpers
-from sdow.breadth_first_search import breadth_first_search
+import helpers as helpers
+from breadth_first_search import breadth_first_search
 
 
 class Database(object):

sdow/server.py

@@ -2,6 +2,7 @@
 Server web framework.
 """
 
+import os
 import time
 import logging
 import google.cloud.logging
@@ -10,12 +11,16 @@
 from flask_compress import Compress
 from flask import Flask, request, jsonify
 
-from sdow.database import Database
-from sdow.helpers import InvalidRequest, fetch_wikipedia_pages_info
+from database import Database
+from helpers import InvalidRequest, fetch_wikipedia_pages_info
 
 
+
+sdow_database = os.environ.get('SDOW_DATABASE','./sdow.sqlite')
+searches_database = os.environ.get('SEARCHES_DATABASE','./searches.sqlite')
+
 # Connect to the SDOW database.
-database = Database(sdow_database='./sdow.sqlite', searches_database='./searches.sqlite')
+database = Database(sdow_database=sdow_database, searches_database=searches_database)
 
 # Initialize the Flask app.
 app = Flask(__name__)