Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8133227
Merge branch 'main' of https://github.com/AOSSIE-Org/PictoPy
rahulharpal1603 Jun 23, 2025
87e6ebe
Merge branch 'AOSSIE-Org:main' into main
rahulharpal1603 Jul 3, 2025
906057f
Merge branch 'main' of https://github.com/AOSSIE-Org/PictoPy
rahulharpal1603 Jul 5, 2025
2c5770b
Merge branch 'AOSSIE-Org:main' into main
rahulharpal1603 Aug 30, 2025
f302ce6
Add sync microservice to resources folder.
rahulharpal1603 Aug 30, 2025
38e21c0
Merge branch 'main' of https://github.com/AOSSIE-Org/PictoPy
rahulharpal1603 Aug 31, 2025
68ec8b0
Debug CI issue 1.0
rahulharpal1603 Aug 31, 2025
e81e4ce
Remove custom logging implementation and related configuration files
rahulharpal1603 Sep 1, 2025
76979c8
Remove redundant file listing steps from build workflow
rahulharpal1603 Sep 1, 2025
3b8c8cc
update logging
rahulharpal1603 Sep 1, 2025
3d88025
Fix resource path in main.rs and update CSP in tauri.conf.json for im…
rahulharpal1603 Sep 1, 2025
6d804a4
Add devtools feature to Tauri configuration and update dependencies
rahulharpal1603 Sep 1, 2025
4e6b7e1
Add user preferences management and integrate into settings page
rahulharpal1603 Sep 1, 2025
0854d20
feat: add process plugin and health check functionality
rahulharpal1603 Sep 7, 2025
03b6a97
chore: update version numbers to 1.0.0 in package.json, Cargo.toml, a…
rahulharpal1603 Sep 7, 2025
2f376c1
refactor: improve code formatting and consistency in microservice and…
rahulharpal1603 Sep 7, 2025
00d7a55
Fix build issues
rahulharpal1603 Sep 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ jobs:
unzip -o *.zip
rm *.zip
ls -l

- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion backend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,6 @@ cython_debug/

images/

dist/
dist/*
!dist/README.md
tests/inputs/PictoPy.thumbnails/
79 changes: 0 additions & 79 deletions backend/app/custom_logging.py

This file was deleted.

10 changes: 0 additions & 10 deletions backend/app/logging_config.json

This file was deleted.

6 changes: 3 additions & 3 deletions backend/app/utils/microservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ def _start_frozen_sync_service() -> bool:
# Get the directory where the current executable is located
if getattr(sys, "frozen", False):
# When frozen, sys.executable points to the main executable
app_dir = Path(sys.executable).parent
app_dir = Path(sys.executable).parent.parent
else:
# Fallback (shouldn't happen in this function)
app_dir = Path(__file__).parent.parent.parent.parent

# Look for the PictoPy_Sync directory and executable
sync_dir = app_dir / "PictoPy_Sync"
# Look for the sync-microservice directory and executable
sync_dir = app_dir / "sync-microservice"

# Determine executable name based on platform
system = platform.system().lower()
Expand Down
4 changes: 2 additions & 2 deletions backend/dist/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Do not delete this file.
## Do not delete the "dist" folder.

This file is essential for the development environment to start.
This folder is essential for the development environment to start.
16 changes: 9 additions & 7 deletions backend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from app.routes.face_clusters import router as face_clusters_router
from app.routes.user_preferences import router as user_preferences_router
from fastapi.openapi.utils import get_openapi
from app.custom_logging import CustomizeLogger


@asynccontextmanager
Expand Down Expand Up @@ -66,8 +65,6 @@ async def lifespan(app: FastAPI):
],
)

app.logger = CustomizeLogger.make_logger("app/logging_config.json")


def generate_openapi_json():
try:
Expand All @@ -90,9 +87,9 @@ def generate_openapi_json():

with open(openapi_path, "w") as f:
json.dump(openapi_schema, f, indent=2)
app.logger.info(f"OpenAPI JSON generated at {openapi_path}")
print(f"OpenAPI JSON generated at {openapi_path}")
except Exception as e:
app.logger.error(f"Failed to generate openapi.json: {e}")
print(f"Failed to generate openapi.json: {e}")


# Add CORS middleware
Expand All @@ -106,7 +103,7 @@ def generate_openapi_json():


# Basic health check endpoint
@app.get("/", tags=["Health"])
@app.get("/health", tags=["Health"])
async def root():
return {"message": "PictoPy Server is up and running!"}

Expand All @@ -125,6 +122,11 @@ async def root():
# Entry point for running with: python3 main.py
if __name__ == "__main__":
multiprocessing.freeze_support() # Required for Windows
config = Config(app=app, host="0.0.0.0", port=8000, log_config=None)
config = Config(
app=app,
host="0.0.0.0",
port=8000,
log_level="info",
)
server = Server(config)
server.run()
Binary file modified backend/requirements.txt
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/backend/backend_python/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
}
],
"paths": {
"/": {
"/health": {
"get": {
"tags": [
"Health"
],
"summary": "Root",
"operationId": "root__get",
"operationId": "root_health_get",
"responses": {
"200": {
"description": "Successful Response",
Expand Down
Empty file.
Empty file.
Empty file removed frontend/api/apiEndpoints.ts
Empty file.
16 changes: 13 additions & 3 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "PictoPy",
"private": true,
"version": "0.0.1",
"version": "1.0.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down Expand Up @@ -42,6 +42,7 @@
"@tauri-apps/api": ">=2.0.0-beta.0",
"@tauri-apps/plugin-dialog": "^2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-process": "^2.3.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-store": "^2.2.0",
"@tauri-apps/plugin-updater": "^2.7.1",
Expand Down
Loading
Loading