Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scripts/.env.sh
scripts/services/.env.server.sh

# Temporary ignoring repos not added to submodules
Real-ESRGAN/
#Real-ESRGAN/
Read3D-Interface/

# Probably never going to use it
Expand Down
1 change: 1 addition & 0 deletions packages/videoCutting/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
36 changes: 36 additions & 0 deletions packages/videoCutting/FastAPI.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import subprocess
import uvicorn
from fastapi import FastAPI
from dotenv import load_dotenv, set_key

app = FastAPI()

dotenv_path = ".env"
load_dotenv(dotenv_path)


# api 範例: http://localhost:8000/processimg/?param1=./input_folder&param2=./output_folder
@app.get("/processimg/")
def process_image(param1: str, param2: str): # 接受兩個參數,分別代表輸入圖片路徑跟輸出圖片路徑
Comment on lines +12 to +14
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to review this now.
suggestion: Can we make it more scalable so we can process an image at a time and to prevent security issues with query params maybe we can use POST instead, thanks

Suggested change
# api 範例: http://localhost:8000/processimg/?param1=./input_folder&param2=./output_folder
@app.get("/processimg/")
def process_image(param1: str, param2: str): # 接受兩個參數,分別代表輸入圖片路徑跟輸出圖片路徑
# api 範例: http://localhost:8000/processimg
@app.post("/processimg/")
def process_image(req):
input_image_path = body['input_img_path']
output_image_path = body['output_img_path']

again, sorry for the late review and not saying the requirements when you're implementing🙇‍♂️🙏

try:
# 根據輸入的參數設定 .env 檔案中的 INPUT_DIR 跟 OUTPUT_DIR
set_key(dotenv_path, "INPUT_DIR", param1)
set_key(dotenv_path, "OUTPUT_DIR", param2)

subprocess.run(["chmod", "+x", "./process_img.sh"], check=True)

# 阻塞地執行 process_img.sh 並傳入參數
result = subprocess.run(
["./process_img.sh"],
check=True, capture_output=True, text=True
)

return {"message": "Script executed successfully", "output": result.stdout.strip()}

except subprocess.CalledProcessError as e:
return {"message": "Script execution failed", "error": str(e), "stderr": e.stderr}

Check warning

Code scanning / CodeQL

Information exposure through an exception

[Stack trace information](1) flows to this location and may be exposed to an external user.

Copilot Autofix

AI over 1 year ago

To fix the problem, we should modify the code to log the detailed error information on the server and return a generic error message to the user. This approach ensures that sensitive information is not exposed to end users while still providing developers with the necessary information to debug issues.

  1. Import the logging module to enable logging of error details.
  2. Configure the logging settings to log error messages to a file or other logging infrastructure.
  3. Modify the exception handling block to log the detailed error information and return a generic error message to the user.
Suggested changeset 1
packages/videoCutting/FastAPI.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/packages/videoCutting/FastAPI.py b/packages/videoCutting/FastAPI.py
--- a/packages/videoCutting/FastAPI.py
+++ b/packages/videoCutting/FastAPI.py
@@ -1,7 +1,9 @@
-import subprocess
-import uvicorn
-from fastapi import FastAPI
-from dotenv import load_dotenv, set_key
-
-app = FastAPI()
+import subprocess
+import uvicorn
+from fastapi import FastAPI
+from dotenv import load_dotenv, set_key
+import logging
+
+logging.basicConfig(filename='app.log', level=logging.ERROR)
+app = FastAPI()
 
@@ -29,4 +31,5 @@
     
-    except subprocess.CalledProcessError as e:
-        return {"message": "Script execution failed", "error": str(e), "stderr": e.stderr}
+    except subprocess.CalledProcessError as e:
+        logging.error(f"Script execution failed: {e}, stderr: {e.stderr}")
+        return {"message": "An internal error has occurred. Please try again later."}
 
EOF
@@ -1,7 +1,9 @@
import subprocess
import uvicorn
from fastapi import FastAPI
from dotenv import load_dotenv, set_key

app = FastAPI()
import subprocess
import uvicorn
from fastapi import FastAPI
from dotenv import load_dotenv, set_key
import logging

logging.basicConfig(filename='app.log', level=logging.ERROR)
app = FastAPI()

@@ -29,4 +31,5 @@

except subprocess.CalledProcessError as e:
return {"message": "Script execution failed", "error": str(e), "stderr": e.stderr}
except subprocess.CalledProcessError as e:
logging.error(f"Script execution failed: {e}, stderr: {e.stderr}")
return {"message": "An internal error has occurred. Please try again later."}

Copilot is powered by AI and may make mistakes. Always verify output.

# 啟動伺服器的部分
if __name__ == "__main__":
# 直接啟動 uvicorn
uvicorn.run("FastAPI:app", host="0.0.0.0", port=3000, reload=True)
140 changes: 140 additions & 0 deletions packages/videoCutting/Real-ESRGAN/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
# ignored folders
datasets/*
experiments/*
results/*
tb_logger/*
wandb/*
tmp/*
weights/*

version.py

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
46 changes: 46 additions & 0 deletions packages/videoCutting/Real-ESRGAN/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
repos:
# flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
args: ["--config=setup.cfg", "--ignore=W504, W503"]

# modify known_third_party
- repo: https://github.com/asottile/seed-isort-config
rev: v2.2.0
hooks:
- id: seed-isort-config

# isort
- repo: https://github.com/timothycrosley/isort
rev: 5.2.2
hooks:
- id: isort

# yapf
- repo: https://github.com/pre-commit/mirrors-yapf
rev: v0.30.0
hooks:
- id: yapf

# codespell
- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
hooks:
- id: codespell

# pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace # Trim trailing whitespace
- id: check-yaml # Attempt to load all yaml files to verify syntax
- id: check-merge-conflict # Check for files that contain merge conflict strings
- id: double-quote-string-fixer # Replace double quoted strings with single quoted strings
- id: end-of-file-fixer # Make sure files end in a newline and only a newline
- id: requirements-txt-fixer # Sort entries in requirements.txt and remove incorrect entry for pkg-resources==0.0.0
- id: fix-encoding-pragma # Remove the coding pragma: # -*- coding: utf-8 -*-
args: ["--remove"]
- id: mixed-line-ending # Replace or check mixed line ending
args: ["--fix=lf"]
128 changes: 128 additions & 0 deletions packages/videoCutting/Real-ESRGAN/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
xintao.wang@outlook.com or xintaowang@tencent.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
29 changes: 29 additions & 0 deletions packages/videoCutting/Real-ESRGAN/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2021, Xintao Wang
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading