Update basic template

Author: jonra1993

create_fastapi_project/templates/__init__.py

@@ -39,12 +39,11 @@ def install_template(root: str, template: ITemplate, app_name: str):
 
     poetry_path = ""
     if template == ITemplate.full or template == ITemplate.langchain_basic:
-        # TODO: CHECK PATHS IN MACOS AND WINDOWS | (os.path.join)
-        poetry_path = os.path.join(root, "backend", "app")
+        # TODO: CHECK PATHS IN MACOS AND WINDOWS | (os.path.join)        
         poetry_frontend_path = os.path.join(root, "frontend", "app")
 
     else:
-        poetry_path = os.path.join(root, "app")
+        poetry_path = os.path.join(root, "backend", "app")
 
     has_pyproject = add_configuration_to_pyproject(poetry_path)
 

create_fastapi_project/templates/basic/.env.example

@@ -1,2 +1,9 @@
 PROJECT_NAME=app
-BACKEND_CORS_ORIGINS=["*"]
+BACKEND_CORS_ORIGINS=["*"]
+
+#############################################
+# Caddy variables
+#############################################
+EXT_ENDPOINT1=127.0.0.1
+LOCAL_1=localhost
+LOCAL_2=127.0.0.1

create_fastapi_project/templates/basic/Makefile

@@ -30,10 +30,10 @@ help:
 	@echo "        Lint code with ruff and try to fix."	
 
 install:
-	cd app && poetry install && cd ..
+	cd backend/app && poetry install && cd ..
 
 run-app:
-	cd app && poetry run uvicorn app.main:app --host 0.0.0.0 --port 8000 && cd ..
+	cd backend/app && poetry run uvicorn app.main:app --host 0.0.0.0 --port 8000 && cd ..
 
 
 run-dev-build:
@@ -52,21 +52,21 @@ stop-prod:
 	docker compose down
 
 formatter:
-	cd app && \
+	cd backend/app && \
 	poetry run black app
 
 mypy:
-	cd app && \
+	cd backend/app && \
 	poetry run mypy .
 
 lint:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app && poetry run black --check app
 
 lint-watch:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app --watch
 
 lint-fix:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app --fix

create_fastapi_project/templates/basic/README.md

@@ -21,6 +21,9 @@ make run-dev
 make run-prod
 ```
 
+Open [http://fastapi.localhost/docs](http://fastapi.localhost/docs) with your browser to see the result.
+
+
 - Run the server without docker:
 
 First, make sure you have all packages installed:

create_fastapi_project/templates/basic/Dockerfile renamed to create_fastapi_project/templates/basic/backend/Dockerfile

@@ -0,0 +1,8 @@
+{
+  email [email protected]
+}
+
+fastapi.{$EXT_ENDPOINT1}:80, fastapi.{$LOCAL_1}:80, fastapi.{$LOCAL_2}:80 {
+  reverse_proxy fastapi_server:8000
+}
+

create_fastapi_project/templates/basic/app/README.md renamed to create_fastapi_project/templates/basic/backend/app/README.md

@@ -3,14 +3,32 @@ version: '3.8'
 services:
   fastapi_server:
     container_name: ${PROJECT_NAME}_fastapi_server
-    build: .
+    build: ./backend
     restart: always
     command: "sh -c 'uvicorn app.main:app --reload --workers 3 --host 0.0.0.0 --port 8000'"
     volumes:
-      - ./app:/code
+      - ./backend/app:/code
     expose:
-      - 8000
-    ports:
-      - 8000:8000      
+      - 8000    
     env_file: ".env"
 
+  caddy_reverse_proxy:
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
+    image: caddy:alpine
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    environment:
+      - EXT_ENDPOINT1=${EXT_ENDPOINT1}
+      - LOCAL_1=${LOCAL_1}
+      - LOCAL_2=${LOCAL_2}
+    volumes:
+      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
+      - caddy_data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_data:
+  caddy_config:
+

create_fastapi_project/templates/basic/app/app/__init__.py renamed to create_fastapi_project/templates/basic/backend/app/app/__init__.py

@@ -3,14 +3,31 @@ version: '3.8'
 services:
   fastapi_server:
     container_name: ${PROJECT_NAME}_fastapi_server
-    build: .
+    build: ./backend
     restart: always
     command: "sh -c 'gunicorn -w 3 -k uvicorn.workers.UvicornWorker app.main:app  --bind 0.0.0.0:8000 --preload --log-level=debug --timeout 120'"
     volumes:
-      - ./app:/code
+      - ./backend/app:/code
     expose:
       - 8000
-    ports:
-      - 8000:8000
     env_file: ".env"
 
+  caddy_reverse_proxy:
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
+    image: caddy:alpine
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    environment:
+      - EXT_ENDPOINT1=${EXT_ENDPOINT1}
+      - LOCAL_1=${LOCAL_1}
+      - LOCAL_2=${LOCAL_2}
+    volumes:
+      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
+      - caddy_data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_data:
+  caddy_config:

create_fastapi_project/templates/basic/app/app/api/__init__.py renamed to create_fastapi_project/templates/basic/backend/app/app/api/__init__.py

@@ -48,6 +48,8 @@ make run-dev
 make run-prod
 ```
 
+Open [http://fastapi.localhost/docs](http://fastapi.localhost/docs) with your browser to see the result.
+
 - Run the server without docker:
 
 First, make sure you have all packages installed:
@@ -60,7 +62,7 @@ make install
 make run-app
 ```
 
-Open [http://fastapi.localhost/docs](http://fastapi.localhost/docs) with your browser to see the result.
+Open [http://localhost:8000/docs](http://localhost:8000/docs) with your browser to see the result.
 
 You can start editing the server by modifying `app/main.py`.