forked from zyddnys/manga-image-translator
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PINNED: diff against upstream #1
Draft
jokester
wants to merge
181
commits into
main
Choose a base branch
from
moeflow-companion-main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
181 commits
Select commit
Hold shift + click to select a range
4c8f53b
prepare a smaller dep set with conda
jokester 5f420f1
new entrypoint
jokester 674dd1c
wip
jokester 7a58f3e
minor changes
jokester 0457293
prevent DivideByZeroError
jokester 2747b70
disable unused CLI/web entrypoint
jokester f134b5a
get translators working
jokester 33fed3a
remove unused env
jokester 55dc200
CI: build mit-worker image
jokester 3ac14e2
run new workflow on push
jokester d0fed2d
cleanup github action disk space
jokester f0610c6
run unix2dos
jokester ca8dca6
Merge remote-tracking branch 'origin/main' into moeflow-companion-main
jokester c08a55e
init venv with conda
jokester f8aad36
revert dos2unix
jokester e8f99bf
downgrade numpy
jokester a722bf7
upgrade openai: conda
jokester ed3a031
wip
jokester 35d9ef3
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester ac91c1a
Merge remote-tracking branch 'origin/main' into moeflow-companion-main
jokester 337b359
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester 26999c9
checkin experiment code
jokester 68a87ed
wip
jokester 9402e03
install python/torch deps from conda repo
jokester 5bfec89
downgrade torch to workaround 'operator::nms' error
jokester bd915aa
wip
jokester 6aaa580
update
jokester 5f398bf
wip
jokester edcf255
share+test
frederik-uni 60854c1
add lock
frederik-uni 3249628
nonce check
frederik-uni cfb12f5
progress report
frederik-uni ff55207
re-enable simple requests without progress reporting
frederik-uni 263adce
mount cache as mambauser uid/gid
jokester bd5ed78
Merge pull request #6 from moeflow-com/switch-micromamba
jokester c6f179b
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester 0458122
config structure
frederik-uni 5711acc
i have python. why bellow?
frederik-uni c5feafe
update to enum
frederik-uni 2ccd802
split manga_translator.py into multiple files
frederik-uni ed2352a
rename batch, demo to local
frederik-uni b7c8ace
use config in manga_translator
frederik-uni 36a1a14
use config in manga_translator
frederik-uni 341b545
more ctx fixes
frederik-uni 0cef143
Merge remote-tracking branch 'origin/main' into config
frederik-uni 796d6d3
wip
jokester 1ef7c17
run with single image
jokester 781243f
wip
jokester fe238a9
wip
jokester 14bc8ca
move preprocessing into config
frederik-uni 82f6ea4
replace ctx in components
frederik-uni f8996c5
fix imports
frederik-uni e29f484
move file
jokester e23510c
fix stuff i forgot
frederik-uni fa6cd8e
convert str to enum in translatorchain
frederik-uni c3829f1
wip
jokester d9aab23
fix
jokester e8ad19e
wip
jokester 1b30b79
fix
jokester e2bb9f1
workaround empty textline
jokester a9cb4d3
Merge remote-tracking branch 'upstream/main' into add-gradio-ui
jokester 3ecfe04
fix
jokester 52609bd
tune logs
jokester 815dcd3
workaround empty textline
jokester d8458f9
docker_prepare: allow set of models/continue_on_error
jokester 16d86a5
type annotations
jokester 73c5516
enable gradio queue
jokester f6d3be0
Update manga_translator.py
popcion 518fdf5
Update README.md
popcion e5b3794
Update README_CN.md
popcion 6827c88
minor changes
jokester b0d6380
Merge pull request #7 from moeflow-com/add-gradio-ui
jokester 85d6739
circular import fix
frederik-uni 2d87f49
load empty config
frederik-uni c6b39d3
fix inpainting
frederik-uni 43625c6
fix inpainting
frederik-uni b73d1dd
load from config
frederik-uni 4aeeb01
Merge remote-tracking branch 'origin/shared' into server
frederik-uni f473ed7
server
frederik-uni f809568
fix pre & post dict
frederik-uni 5c672c0
Merge remote-tracking branch 'origin/config' into server
frederik-uni bc7f2fc
python sucks
frederik-uni 30d9b35
api logic
frederik-uni b66237e
replace api
frederik-uni 897070c
server refactor
frederik-uni d0e48b9
stream update
frederik-uni 3be082d
stream_image,stream_json now working
frederik-uni 8aa1f2b
remove old tasks on interrupt connection
frederik-uni 0160a3e
change routes
frederik-uni aa94927
api goals
frederik-uni 4dfe04c
more todos & args
frederik-uni 29a7625
some docs & queue fix
frederik-uni 5e16387
stream type fix
frederik-uni 0c3908e
add server ui
frederik-uni b462d12
delete old code
frederik-uni 75f07f4
changed queue a bit
frederik-uni bba5fc6
custom queue element with deconstructor
frederik-uni a9d6e18
remove an indent
frederik-uni 7085db8
Merge remote-tracking branch 'origin/shared' into server
frederik-uni 259b807
byte response with cpp&rs examples
frederik-uni cbf902d
move files into examples
frederik-uni a2f98e6
fix docs
frederik-uni a0525dd
convert to normal enum
frederik-uni 85177ed
Merge remote-tracking branch 'origin/config' into server
frederik-uni 322ea78
configs
frederik-uni effed2c
Merge pull request #744 from frederik-uni/shared
zyddnys cc89fe6
Merge pull request #746 from moeflow-com/minor-fixes
zyddnys 661fd5e
Merge pull request #747 from popcion/main
zyddnys b6cb63d
Merge remote-tracking branch 'origin/main' into config
frederik-uni c9d8cbe
fix ctx -> config after merge
frederik-uni 510db7f
server
frederik-uni 55c59b6
python sucks
frederik-uni 0d8d582
api logic
frederik-uni bc3f02e
replace api
frederik-uni 536859e
server refactor
frederik-uni 4a8ec99
stream update
frederik-uni 85d7b1e
stream_image,stream_json now working
frederik-uni d07e7dc
remove old tasks on interrupt connection
frederik-uni e9ef901
change routes
frederik-uni c42c9f6
api goals
frederik-uni b53b79e
more todos & args
frederik-uni 06e04ca
some docs & queue fix
frederik-uni cbd01ad
stream type fix
frederik-uni 858675a
add server ui
frederik-uni 8aeff8e
delete old code
frederik-uni aef0a27
changed queue a bit
frederik-uni cc37ca2
custom queue element with deconstructor
frederik-uni 6cd1819
byte response with cpp&rs examples
frederik-uni cf7412e
move files into examples
frederik-uni aac997e
fix docs
frederik-uni 589e037
configs
frederik-uni 6c6a4b5
delete old code & move file
frederik-uni 38a3a5b
Merge remote-tracking branch 'origin/server' into server
frederik-uni cb98b6d
gpt 3.5 fix
frederik-uni ef120c0
Merge remote-tracking branch 'origin/config' into server
frederik-uni 361e0ba
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester 702101d
wip
jokester 58ada4f
wip
jokester 0c4a06e
revert
jokester 38b2143
fix
jokester 11c8172
Merge pull request #8 from moeflow-com/add-gradio-ui
jokester 26fb926
Merge pull request #745 from frederik-uni/config
zyddnys 20808d2
Merge pull request #751 from frederik-uni/server
zyddnys e406228
fix #703
zyddnys 1fc572c
fix
zyddnys 260dd0a
some docs
frederik-uni a458b7f
add toml support
frederik-uni cb1a5a3
issues with main.py when executing with command line
frederik-uni de441a4
typo
frederik-uni 1b441b8
why does the order matter?
frederik-uni cb2ed24
why does the order matter?
frederik-uni 9a19389
this shouldnt be here
frederik-uni e979c43
fixes #760
frederik-uni 3b1870c
Merge pull request #759 from frederik-uni/docs
zyddnys 837b31f
pin httpx version
jokester 2df0c17
switch base image & simplify Dockerfile
jokester 62a917e
skip dockerhub login in forks
jokester 147c26a
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester 3de516c
Merge branch 'switch-docker-base-image' into moeflow-companion-main
jokester f6c9de1
make gh action happy
jokester 55556d9
make gh action happy
jokester 1bd5122
remove installation from debian repo
jokester d3e67fa
remove debian packages
jokester d74ed22
defining an arg in the constructor might be easier than catching the …
frederik-uni 25bc252
Merge pull request #762 from moeflow-com/fix-dep-fails
zyddnys ad577f2
Merge pull request #763 from moeflow-com/switch-docker-base-image
zyddnys 2c455dc
Merge pull request #764 from frederik-uni/fix-translator.textlines
zyddnys 3d9b532
fix
jokester 7126b3e
tune deps
jokester 0dede5d
Merge pull request #766 from moeflow-com/fix-dockerbuild
zyddnys 0216cdc
Merge remote-tracking branch 'upstream/main' into moeflow-companion-main
jokester bf7c1b7
move files
jokester 62e4dc2
wip
jokester 68299dc
fix
jokester 02f0e58
wip
jokester 2a5a27c
fix
jokester 74d1c25
adjust UI
jokester 6ea0c3a
export moeflow archive
jokester 6b4294b
workaround
jokester d4c8402
set default from cuda availability
jokester 8729593
Merge pull request #9 from moeflow-com/gradio-add-translate-packager
jokester File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
prepare a smaller dep set with conda
- Loading branch information
commit 4c8f53be14019ba1bfc3030ab8853e9a80ef61c0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
name: mit-py311 | ||
channels: | ||
- pytorch | ||
- nvidia | ||
- defaults | ||
dependencies: | ||
- _libgcc_mutex=0.1=main | ||
- _openmp_mutex=5.1=1_gnu | ||
- blas=1.0=mkl | ||
- brotli-python=1.0.9=py311h6a678d5_7 | ||
- bzip2=1.0.8=h5eee18b_5 | ||
- ca-certificates=2024.3.11=h06a4308_0 | ||
- certifi=2024.2.2=py311h06a4308_0 | ||
- charset-normalizer=2.0.4=pyhd3eb1b0_0 | ||
- cuda-cudart=12.1.105=0 | ||
- cuda-cupti=12.1.105=0 | ||
- cuda-libraries=12.1.0=0 | ||
- cuda-nvrtc=12.1.105=0 | ||
- cuda-nvtx=12.1.105=0 | ||
- cuda-opencl=12.4.127=0 | ||
- cuda-runtime=12.1.0=0 | ||
- ffmpeg=4.3=hf484d3e_0 | ||
- filelock=3.13.1=py311h06a4308_0 | ||
- freetype=2.12.1=h4a9f257_0 | ||
- gmp=6.2.1=h295c915_3 | ||
- gmpy2=2.1.2=py311hc9b5ff0_0 | ||
- gnutls=3.6.15=he1e5248_0 | ||
- idna=3.4=py311h06a4308_0 | ||
- intel-openmp=2023.1.0=hdb19cb5_46306 | ||
- jinja2=3.1.3=py311h06a4308_0 | ||
- jpeg=9e=h5eee18b_1 | ||
- lame=3.100=h7b6447c_0 | ||
- lcms2=2.12=h3be6417_0 | ||
- ld_impl_linux-64=2.38=h1181459_1 | ||
- lerc=3.0=h295c915_0 | ||
- libcublas=12.1.0.26=0 | ||
- libcufft=11.0.2.4=0 | ||
- libcufile=1.9.1.3=0 | ||
- libcurand=10.3.5.147=0 | ||
- libcusolver=11.4.4.55=0 | ||
- libcusparse=12.0.2.55=0 | ||
- libdeflate=1.17=h5eee18b_1 | ||
- libffi=3.4.4=h6a678d5_0 | ||
- libgcc-ng=11.2.0=h1234567_1 | ||
- libgomp=11.2.0=h1234567_1 | ||
- libiconv=1.16=h7f8727e_2 | ||
- libidn2=2.3.4=h5eee18b_0 | ||
- libjpeg-turbo=2.0.0=h9bf148f_0 | ||
- libnpp=12.0.2.50=0 | ||
- libnvjitlink=12.1.105=0 | ||
- libnvjpeg=12.1.1.14=0 | ||
- libpng=1.6.39=h5eee18b_0 | ||
- libstdcxx-ng=11.2.0=h1234567_1 | ||
- libtasn1=4.19.0=h5eee18b_0 | ||
- libtiff=4.5.1=h6a678d5_0 | ||
- libunistring=0.9.10=h27cfd23_0 | ||
- libuuid=1.41.5=h5eee18b_0 | ||
- libwebp-base=1.3.2=h5eee18b_0 | ||
- llvm-openmp=14.0.6=h9e868ea_0 | ||
- lz4-c=1.9.4=h6a678d5_0 | ||
- markupsafe=2.1.3=py311h5eee18b_0 | ||
- mkl=2023.1.0=h213fc3f_46344 | ||
- mkl-service=2.4.0=py311h5eee18b_1 | ||
- mkl_fft=1.3.8=py311h5eee18b_0 | ||
- mkl_random=1.2.4=py311hdb19cb5_0 | ||
- mpc=1.1.0=h10f8cd9_1 | ||
- mpfr=4.0.2=hb69a4c5_1 | ||
- mpmath=1.3.0=py311h06a4308_0 | ||
- ncurses=6.4=h6a678d5_0 | ||
- nettle=3.7.3=hbbd107a_1 | ||
- networkx=3.1=py311h06a4308_0 | ||
- numpy=1.26.4=py311h08b1b3b_0 | ||
- numpy-base=1.26.4=py311hf175353_0 | ||
- openh264=2.1.1=h4ff587b_0 | ||
- openjpeg=2.4.0=h3ad879b_0 | ||
- openssl=3.0.13=h7f8727e_0 | ||
- pillow=10.2.0=py311h5eee18b_0 | ||
- pip=23.3.1=py311h06a4308_0 | ||
- pysocks=1.7.1=py311h06a4308_0 | ||
- python=3.11.8=h955ad1f_0 | ||
- pytorch=2.2.2=py3.11_cuda12.1_cudnn8.9.2_0 | ||
- pytorch-cuda=12.1=ha16c6d3_5 | ||
- pytorch-mutex=1.0=cuda | ||
- pyyaml=6.0.1=py311h5eee18b_0 | ||
- readline=8.2=h5eee18b_0 | ||
- requests=2.31.0=py311h06a4308_1 | ||
- setuptools=68.2.2=py311h06a4308_0 | ||
- sqlite=3.41.2=h5eee18b_0 | ||
- sympy=1.12=py311h06a4308_0 | ||
- tbb=2021.8.0=hdb19cb5_0 | ||
- tk=8.6.12=h1ccaba5_0 | ||
- torchaudio=2.2.2=py311_cu121 | ||
- torchtriton=2.2.0=py311 | ||
- torchvision=0.17.2=py311_cu121 | ||
- typing_extensions=4.9.0=py311h06a4308_1 | ||
- tzdata=2024a=h04d1e81_0 | ||
- urllib3=2.1.0=py311h06a4308_1 | ||
- wheel=0.41.2=py311h06a4308_0 | ||
- xz=5.4.6=h5eee18b_0 | ||
- yaml=0.2.5=h7b6447c_0 | ||
- zlib=1.2.13=h5eee18b_0 | ||
- zstd=1.5.5=hc292b87_0 | ||
- pip: | ||
- pydensecrf@https://github.com/lucasb-eyer/pydensecrf/archive/refs/heads/master.zip | ||
- opencv-python | ||
- celery==5.3.6 | ||
- celery[redis]==5.3.6 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Simplify redundant celery declarations. The celery package is declared twice: celery==5.3.6
celery[redis]==5.3.6 Combine these into a single declaration: - celery==5.3.6
- celery[redis]==5.3.6
+ celery[redis]==5.3.6 |
||
- asgiref | ||
- aiohttp | ||
- omegaconf==2.3.0 | ||
- langcodes | ||
- marshmallow | ||
- colorama | ||
- tqdm | ||
- einops | ||
- shapely | ||
- scikit-image | ||
- pyclipper | ||
- python-dotenv | ||
- py3langid | ||
- timm | ||
- redis | ||
- manga-ocr | ||
- pymongo | ||
- pandas | ||
- onnxruntime | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove duplicate numpy declaration.
numpy is declared twice with potentially conflicting versions:
numpy=1.26.4
numpy==1.26.4
While they currently specify the same version, having duplicate declarations can lead to confusion and potential conflicts in future updates.
Remove the pip declaration since the conda one is sufficient:
- numpy==1.26.4
Also applies to: 106-106