add api package

nonnontrivial · May 3, 2024 · aecac6a · aecac6a
1 parent 413d9dd
commit aecac6a
Show file tree

Hide file tree

Showing 44 changed files with 21 additions and 8 deletions.
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -9,4 +9,4 @@ RUN pip install --no-cache-dir --upgrade -r ./requirements.txt
 
 COPY . .
 
-CMD python -m uvicorn ctts.api:app --host 0.0.0.0 --port 80
+CMD python -m uvicorn api.main:app --host 0.0.0.0 --port 8000
diff --git a/api/README.md b/api/README.md
@@ -2,10 +2,8 @@
 
 ## Building and training the sky brightness model
 
-> Note that `globe_at_night.tar.gz` will need to unpacked into `./data/globe_at_night`
-
-- `python -m ctts.model.build` to write the csv that the model trains on
-- `python -m ctts.model.train` to train on the data in the csv
+- `python -m api.model.build` to write the csv that the model trains on
+- `python -m api.model.train` to train on the data in the csv
 
 ## HTTP APIs
 
@@ -15,7 +13,7 @@
 
 ```sh
 pip install -r requirements.txt
-python -m uvicorn ctts.api:app --reload
+python -m uvicorn api.main:app --host 0.0.0.0 --port 8000 --reload
 ```
 
 - artificial sky brightness (light pollution)

diff --git a/api/__init__.py → api/api/__init__.py b/api/__init__.py → api/api/__init__.py
diff --git a/api/data/globe_at_night.csv → api/api/data/globe_at_night.csv b/api/data/globe_at_night.csv → api/api/data/globe_at_night.csv
diff --git a/api/data/globe_at_night.tar.gz → api/api/data/globe_at_night.tar.gz b/api/data/globe_at_night.tar.gz → api/api/data/globe_at_night.tar.gz
diff --git a/api/data/globe_at_night/GaN2006.csv → api/api/data/globe_at_night/GaN2006.csv b/api/data/globe_at_night/GaN2006.csv → api/api/data/globe_at_night/GaN2006.csv
diff --git a/api/data/globe_at_night/GaN2007.csv → api/api/data/globe_at_night/GaN2007.csv b/api/data/globe_at_night/GaN2007.csv → api/api/data/globe_at_night/GaN2007.csv
diff --git a/api/data/globe_at_night/GaN2008.csv → api/api/data/globe_at_night/GaN2008.csv b/api/data/globe_at_night/GaN2008.csv → api/api/data/globe_at_night/GaN2008.csv
diff --git a/api/data/globe_at_night/GaN2009.csv → api/api/data/globe_at_night/GaN2009.csv b/api/data/globe_at_night/GaN2009.csv → api/api/data/globe_at_night/GaN2009.csv
diff --git a/api/data/globe_at_night/GaN2010.csv → api/api/data/globe_at_night/GaN2010.csv b/api/data/globe_at_night/GaN2010.csv → api/api/data/globe_at_night/GaN2010.csv
diff --git a/api/data/globe_at_night/GaN2011.csv → api/api/data/globe_at_night/GaN2011.csv b/api/data/globe_at_night/GaN2011.csv → api/api/data/globe_at_night/GaN2011.csv
diff --git a/api/data/globe_at_night/GaN2012.csv → api/api/data/globe_at_night/GaN2012.csv b/api/data/globe_at_night/GaN2012.csv → api/api/data/globe_at_night/GaN2012.csv
diff --git a/api/data/globe_at_night/GaN2013.csv → api/api/data/globe_at_night/GaN2013.csv b/api/data/globe_at_night/GaN2013.csv → api/api/data/globe_at_night/GaN2013.csv
diff --git a/api/data/globe_at_night/GaN2014.csv → api/api/data/globe_at_night/GaN2014.csv b/api/data/globe_at_night/GaN2014.csv → api/api/data/globe_at_night/GaN2014.csv
diff --git a/api/data/globe_at_night/GaN2015.csv → api/api/data/globe_at_night/GaN2015.csv b/api/data/globe_at_night/GaN2015.csv → api/api/data/globe_at_night/GaN2015.csv
diff --git a/api/data/globe_at_night/GaN2016.csv → api/api/data/globe_at_night/GaN2016.csv b/api/data/globe_at_night/GaN2016.csv → api/api/data/globe_at_night/GaN2016.csv
diff --git a/api/data/globe_at_night/GaN2017.csv → api/api/data/globe_at_night/GaN2017.csv b/api/data/globe_at_night/GaN2017.csv → api/api/data/globe_at_night/GaN2017.csv
diff --git a/api/data/globe_at_night/GaN2018.csv → api/api/data/globe_at_night/GaN2018.csv b/api/data/globe_at_night/GaN2018.csv → api/api/data/globe_at_night/GaN2018.csv
diff --git a/api/data/globe_at_night/GaN2019.csv → api/api/data/globe_at_night/GaN2019.csv b/api/data/globe_at_night/GaN2019.csv → api/api/data/globe_at_night/GaN2019.csv
diff --git a/api/data/globe_at_night/GaN2020.csv → api/api/data/globe_at_night/GaN2020.csv b/api/data/globe_at_night/GaN2020.csv → api/api/data/globe_at_night/GaN2020.csv
diff --git a/api/data/globe_at_night/GaN2021.csv → api/api/data/globe_at_night/GaN2021.csv b/api/data/globe_at_night/GaN2021.csv → api/api/data/globe_at_night/GaN2021.csv
diff --git a/api/data/globe_at_night/GaN2022.csv → api/api/data/globe_at_night/GaN2022.csv b/api/data/globe_at_night/GaN2022.csv → api/api/data/globe_at_night/GaN2022.csv
diff --git a/api/data/globe_at_night/GaN2023.csv → api/api/data/globe_at_night/GaN2023.csv b/api/data/globe_at_night/GaN2023.csv → api/api/data/globe_at_night/GaN2023.csv
diff --git a/api/data/map/world2022.png → api/api/data/map/world2022.png b/api/data/map/world2022.png → api/api/data/map/world2022.png
diff --git a/api/data/sources.md → api/api/data/sources.md b/api/data/sources.md → api/api/data/sources.md
diff --git a/api/api.py → api/api/main.py b/api/api.py → api/api/main.py
diff --git a/api/model/__init__.py → api/api/model/__init__.py b/api/model/__init__.py → api/api/model/__init__.py
diff --git a/api/model/build.py → api/api/model/build.py b/api/model/build.py → api/api/model/build.py
diff --git a/api/model/config.ini → api/api/model/config.ini b/api/model/config.ini → api/api/model/config.ini
diff --git a/api/model/train.py → api/api/model/train.py b/api/model/train.py → api/api/model/train.py
@@ -27,6 +27,7 @@
     raise FileNotFoundError()
 
 df = pd.read_csv(path_to_gan_dataframe)
+print(f"read csv with {len(df)} rows")
 
 torch.set_printoptions(sci_mode=False)
 feature_tensor = torch.tensor(df[features].values.astype(np.float32))

diff --git a/api/pollution/__init__.py → api/api/pollution/__init__.py b/api/pollution/__init__.py → api/api/pollution/__init__.py
diff --git a/api/pollution/pollution.py → api/api/pollution/pollution.py b/api/pollution/pollution.py → api/api/pollution/pollution.py
diff --git a/api/prediction/__init__.py → api/api/prediction/__init__.py b/api/prediction/__init__.py → api/api/prediction/__init__.py
diff --git a/api/prediction/constants.py → api/api/prediction/constants.py b/api/prediction/constants.py → api/api/prediction/constants.py
diff --git a/api/prediction/model.pth → api/api/prediction/model.pth b/api/prediction/model.pth → api/api/prediction/model.pth
diff --git a/api/prediction/nn.py → api/api/prediction/nn.py b/api/prediction/nn.py → api/api/prediction/nn.py
diff --git a/api/prediction/observer_site.py → api/api/prediction/observer_site.py b/api/prediction/observer_site.py → api/api/prediction/observer_site.py
diff --git a/api/prediction/open_meteo_client.py → api/api/prediction/open_meteo_client.py b/api/prediction/open_meteo_client.py → api/api/prediction/open_meteo_client.py
diff --git a/api/prediction/prediction.py → api/api/prediction/prediction.py b/api/prediction/prediction.py → api/api/prediction/prediction.py
diff --git a/api/prediction/utils.py → api/api/prediction/utils.py b/api/prediction/utils.py → api/api/prediction/utils.py
diff --git a/api/api/tests/__init__.py b/api/api/tests/__init__.py
diff --git a/api/test_pollution_api.py → api/api/tests/test_pollution_api.py b/api/test_pollution_api.py → api/api/tests/test_pollution_api.py
@@ -1,7 +1,7 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from .api import app
+from api import app
 
 client = TestClient(app)
 API_PREFIX = "/api/v1"

diff --git a/api/test_prediction_api.py → api/api/tests/test_prediction_api.py b/api/test_prediction_api.py → api/api/tests/test_prediction_api.py
@@ -1,7 +1,7 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from .api import app
+from api import app
 
 client = TestClient(app)
 API_PREFIX = "/api/v1"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,14 @@
+services:
+  api:
+    build: ./api
+    ports:
+      - "8000:8000"
+  rabbitmq:
+    image: "rabbitmq:management"
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      RABBITMQ_DEFAULT_USER: "guest"
+      RABBITMQ_DEFAULT_PASS: "guest"
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ RUN pip install --no-cache-dir --upgrade -r ./requirements.txt

		COPY . .

		CMD python -m uvicorn ctts.api:app --host 0.0.0.0 --port 80
		CMD python -m uvicorn api.main:app --host 0.0.0.0 --port 8000