diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..2ba7012e44112160932141a506fd69e10dabc151 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,36 @@ +*.7z filter=lfs diff=lfs merge=lfs -text +*.arrow filter=lfs diff=lfs merge=lfs -text +*.bin filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.ckpt filter=lfs diff=lfs merge=lfs -text +*.ftz filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.h5 filter=lfs diff=lfs merge=lfs -text +*.joblib filter=lfs diff=lfs merge=lfs -text +*.lfs.* filter=lfs diff=lfs merge=lfs -text +*.mlmodel filter=lfs diff=lfs merge=lfs -text +*.model filter=lfs diff=lfs merge=lfs -text +*.msgpack filter=lfs diff=lfs merge=lfs -text +*.npy filter=lfs diff=lfs merge=lfs -text +*.npz filter=lfs diff=lfs merge=lfs -text +*.onnx filter=lfs diff=lfs merge=lfs -text +*.ot filter=lfs diff=lfs merge=lfs -text +*.parquet filter=lfs diff=lfs merge=lfs -text +*.pb filter=lfs diff=lfs merge=lfs -text +*.pickle filter=lfs diff=lfs merge=lfs -text +*.pkl filter=lfs diff=lfs merge=lfs -text +*.pt filter=lfs diff=lfs merge=lfs -text +*.pth filter=lfs diff=lfs merge=lfs -text +*.rar filter=lfs diff=lfs merge=lfs -text +*.safetensors filter=lfs diff=lfs merge=lfs -text +saved_model/**/* filter=lfs diff=lfs merge=lfs -text +*.tar.* filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text +*.tflite filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.wasm filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text +*tfevents* filter=lfs diff=lfs merge=lfs -text +git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.pack filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..fd6106c276e40c982cc460c2830fd29c5ce62644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +__pycache__/ +.vscode/ +.venv/ +.env + +presets/ \ No newline at end of file diff --git a/README.ko.md b/README.ko.md new file mode 100644 index 0000000000000000000000000000000000000000..70ed62f63236a2ad11912db2edce83d1947f2bc7 --- /dev/null +++ b/README.ko.md @@ -0,0 +1,61 @@ +[Automatic1111 웹UI](https://github.com/AUTOMATIC1111/stable-diffusion-webui)를 위한 태깅(라벨링) 확장 기능 +--- +DeepDanbooru 와 같은 모델을 통해 단일 또는 여러 이미지로부터 부루에서 사용하는 태그를 알아냅니다. + +[You don't know how to read Korean? Read it in English here!](README.md) + +## 들어가기 앞서 +모델과 대부분의 코드는 제가 만들지 않았고 [DeepDanbooru](https://github.com/KichangKim/DeepDanbooru) 와 MrSmillingWolf 의 태거에서 가져왔습니다. + +## 설치하기 +1. *확장기능* -> *URL로부터 확장기능 설치* -> 이 레포지토리 주소 입력 -> *설치* + - 또는 이 레포지토리를 `extensions/` 디렉터리 내에 클론합니다. + ```sh + $ git clone https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git extensions/tagger + ``` + +1. 모델 추가하기 + - #### *MrSmilingWolf's model (a.k.a. Waifu Diffusion 1.4 tagger)* + 처음 실행할 때 [HuggingFace 레포지토리](https://huggingface.co/SmilingWolf/wd-v1-4-vit-tagger)로부터 자동으로 받아옵니다. + + 모델과 관련된 또는 추가 학습에 대한 질문은 원작자인 MrSmilingWolf#5991 으로 물어봐주세요. + + - #### *DeepDanbooru* + 1. 다양한 모델 파일은 아래 주소에서 찾을 수 있습니다. + - [DeepDanbooru model](https://github.com/KichangKim/DeepDanbooru/releases) + - [e621 model by 🐾Zack🐾#1984](https://discord.gg/BDFpq9Yb7K) + *(NSFW 주의!)* + + 1. 모델과 설정 파일이 포함된 프로젝트 폴더를 `models/deepdanbooru` 경로로 옮깁니다. + + 1. 파일 구조는 다음과 같습니다: + ``` + models/ + └╴deepdanbooru/ + ├╴deepdanbooru-v3-20211112-sgd-e28/ + │ ├╴project.json + │ └╴... + │ + ├╴deepdanbooru-v4-20200814-sgd-e30/ + │ ├╴project.json + │ └╴... + │ + ├╴e621-v3-20221117-sgd-e32/ + │ ├╴project.json + │ └╴... + │ + ... + ``` + +1. 웹UI 를 시작하거나 재시작합니다. + - 또는 *Interrogator* 드롭다운 상자 우측에 있는 새로고침 버튼을 누릅니다. + + +## 스크린샷 +![Screenshot](docs/screenshot.png) + +Artwork made by [hecattaart](https://vk.com/hecattaart?w=wall-89063929_3767) + +## 저작권 + +빌려온 코드(예: `dbimutils.py`)를 제외하고 모두 Public domain \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..de4b8416e77317bd5df65914b2a2a9bf188fb96d --- /dev/null +++ b/README.md @@ -0,0 +1,118 @@ +Tagger for [Automatic1111's WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) +--- +Interrogate booru style tags for single or multiple image files using various models, such as DeepDanbooru. + +[한국어를 사용하시나요? 여기에 한국어 설명서가 있습니다!](README.ko.md) + +## Disclaimer +I didn't make any models, and most of the code was heavily borrowed from the [DeepDanbooru](https://github.com/KichangKim/DeepDanbooru) and MrSmillingWolf's tagger. + +## Installation +1. *Extensions* -> *Install from URL* -> Enter URL of this repository -> Press *Install* button + - or clone this repository under `extensions/` + ```sh + $ git clone https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git extensions/tagger + ``` + +1. Add interrogate model + - #### *MrSmilingWolf's model (a.k.a. Waifu Diffusion 1.4 tagger)* + Downloads automatically from the [HuggingFace repository](https://huggingface.co/SmilingWolf/wd-v1-4-vit-tagger) the first time you run it. + + Please ask the original author MrSmilingWolf#5991 for questions related to model or additional training. + + ##### ViT vs Convnext + > To make it clear: the ViT model is the one used to tag images for WD 1.4. That's why the repo was originally called like that. This one has been trained on the same data and tags, but has got no other relation to WD 1.4, aside from stemming from the same coordination effort. They were trained in parallel, and the best one at the time was selected for WD 1.4 + + > This particular model was trained later and might actually be slightly better than the ViT one. Difference is in the noise range tho + + — [SmilingWolf](https://github.com/SmilingWolf) from [this thread](https://discord.com/channels/930499730843250783/1052283314997837955) in the [東方Project AI server](https://discord.com/invite/touhouai) + + - #### *DeepDanbooru* + 1. Various model files can be found below. + - [DeepDanbooru models](https://github.com/KichangKim/DeepDanbooru/releases) + - [e621 model by 🐾Zack🐾#1984](https://discord.gg/BDFpq9Yb7K) + *(link contains NSFW contents!)* + + 1. Move the project folder containing the model and config to `models/deepdanbooru` + + 1. The file structure should look like: + ``` + models/ + └╴deepdanbooru/ + ├╴deepdanbooru-v3-20211112-sgd-e28/ + │ ├╴project.json + │ └╴... + │ + ├╴deepdanbooru-v4-20200814-sgd-e30/ + │ ├╴project.json + │ └╴... + │ + ├╴e621-v3-20221117-sgd-e32/ + │ ├╴project.json + │ └╴... + │ + ... + ``` + +1. Start or restart the WebUI. + - or you can press refresh button after *Interrogator* dropdown box. + + +## Model comparison + +* Used image: [hecattaart's artwork](https://vk.com/hecattaart?w=wall-89063929_3767) +* Threshold: `0.5` + +### DeepDanbooru +Used the same image as the one used in the Screenshot item + +#### [`deepdanbooru-v3-20211112-sgd-e28`](https://github.com/KichangKim/DeepDanbooru/releases/tag/v3-20211112-sgd-e28) +``` +1girl, animal ears, cat ears, cat tail, clothes writing, full body, rating:safe, shiba inu, shirt, shoes, simple background, sneakers, socks, solo, standing, t-shirt, tail, white background, white shirt +``` + +#### [`deepdanbooru-v4-20200814-sgd-e30`](https://github.com/KichangKim/DeepDanbooru/releases/tag/v4-20200814-sgd-e30) +``` +1girl, animal, animal ears, bottomless, clothes writing, full body, rating:safe, shirt, shoes, short sleeves, sneakers, solo, standing, t-shirt, tail, white background, white shirt +``` + +#### `e621-v3-20221117-sgd-e32` +``` +anthro, bottomwear, clothing, footwear, fur, hi res, mammal, shirt, shoes, shorts, simple background, sneakers, socks, solo, standing, text on clothing, text on topwear, topwear, white background +``` + +### Waifu Diffusion Tagger + +#### [`wd14-vit`](https://huggingface.co/SmilingWolf/wd-v1-4-vit-tagger) +``` +1boy, animal ears, dog, furry, leg hair, male focus, shirt, shoes, simple background, socks, solo, tail, white background +``` + +#### [`wd14-convnext`](https://huggingface.co/SmilingWolf/wd-v1-4-convnext-tagger) +``` +full body, furry, shirt, shoes, simple background, socks, solo, tail, white background +``` + +#### [`wd14-vit-v2`](https://huggingface.co/SmilingWolf/wd-v1-4-vit-tagger-v2) +``` +1boy, animal ears, cat, furry, male focus, shirt, shoes, simple background, socks, solo, tail, white background +``` + +#### [`wd14-convnext-v2`](https://huggingface.co/SmilingWolf/wd-v1-4-convnext-tagger-v2) +``` +animal focus, clothes writing, earrings, full body, meme, shirt, shoes, simple background, socks, solo, sweat, tail, white background, white shirt +``` + +#### [`wd14-swinv2-v2`](https://huggingface.co/SmilingWolf/wd-v1-4-swinv2-tagger-v2) +``` +1boy, arm hair, black footwear, cat, dirty, full body, furry, leg hair, male focus, shirt, shoes, simple background, socks, solo, standing, tail, white background, white shirt +``` + +## Screenshot +![Screenshot](docs/screenshot.png) + +Artwork made by [hecattaart](https://vk.com/hecattaart?w=wall-89063929_3767) + +## Copyright + +Public domain, except borrowed parts (e.g. `dbimutils.py`) \ No newline at end of file diff --git a/__pycache__/preload.cpython-310.pyc b/__pycache__/preload.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9a11328f5c9e134f455b9cce6e2e5262b0ab8348 Binary files /dev/null and b/__pycache__/preload.cpython-310.pyc differ diff --git a/docs/screenshot.png b/docs/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..5e07148c365e9e91149fedc1072e84c091189e9d Binary files /dev/null and b/docs/screenshot.png differ diff --git a/git/FETCH_HEAD b/git/FETCH_HEAD new file mode 100644 index 0000000000000000000000000000000000000000..7696e503986b754a1c7b965754b76106a64e9baf --- /dev/null +++ b/git/FETCH_HEAD @@ -0,0 +1 @@ +a9eacb1eff904552d3012babfa28b57e1d3e295c branch 'master' of https://github.com/toriato/stable-diffusion-webui-wd14-tagger diff --git a/git/HEAD b/git/HEAD new file mode 100644 index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c --- /dev/null +++ b/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/git/ORIG_HEAD b/git/ORIG_HEAD new file mode 100644 index 0000000000000000000000000000000000000000..1a61c4e9724503db20a80808f6b1366411be0f24 --- /dev/null +++ b/git/ORIG_HEAD @@ -0,0 +1 @@ +4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd diff --git a/git/config b/git/config new file mode 100644 index 0000000000000000000000000000000000000000..5849ad92efcd1ea1ebc1655f4a02da6792825409 --- /dev/null +++ b/git/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true +[remote "origin"] + url = https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/git/description b/git/description new file mode 100644 index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 --- /dev/null +++ b/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/git/hooks/applypatch-msg.sample b/git/hooks/applypatch-msg.sample new file mode 100644 index 0000000000000000000000000000000000000000..a5d7b84a673458d14d9aab082183a1968c2c7492 --- /dev/null +++ b/git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/git/hooks/commit-msg.sample b/git/hooks/commit-msg.sample new file mode 100644 index 0000000000000000000000000000000000000000..b58d1184a9d43a39c0d95f32453efc78581877d6 --- /dev/null +++ b/git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/git/hooks/fsmonitor-watchman.sample b/git/hooks/fsmonitor-watchman.sample new file mode 100644 index 0000000000000000000000000000000000000000..14ed0aa42de0f291c0f696922110e70544c3dae2 --- /dev/null +++ b/git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $last_update_token, + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/git/hooks/post-update.sample b/git/hooks/post-update.sample new file mode 100644 index 0000000000000000000000000000000000000000..ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e --- /dev/null +++ b/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/git/hooks/pre-applypatch.sample b/git/hooks/pre-applypatch.sample new file mode 100644 index 0000000000000000000000000000000000000000..4142082bcb939bbc17985a69ba748491ac6b62a5 --- /dev/null +++ b/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/git/hooks/pre-commit.sample b/git/hooks/pre-commit.sample new file mode 100644 index 0000000000000000000000000000000000000000..e144712c85c055bcf3248ab342592b440a477062 --- /dev/null +++ b/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/git/hooks/pre-merge-commit.sample b/git/hooks/pre-merge-commit.sample new file mode 100644 index 0000000000000000000000000000000000000000..399eab1924e39da570b389b0bef1ca713b3b05c3 --- /dev/null +++ b/git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/git/hooks/pre-push.sample b/git/hooks/pre-push.sample new file mode 100644 index 0000000000000000000000000000000000000000..4ce688d32b7532862767345f2b991ae856f7d4a8 --- /dev/null +++ b/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/git/hooks/pre-rebase.sample b/git/hooks/pre-rebase.sample new file mode 100644 index 0000000000000000000000000000000000000000..6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 --- /dev/null +++ b/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/git/hooks/pre-receive.sample b/git/hooks/pre-receive.sample new file mode 100644 index 0000000000000000000000000000000000000000..a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 --- /dev/null +++ b/git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/git/hooks/prepare-commit-msg.sample b/git/hooks/prepare-commit-msg.sample new file mode 100644 index 0000000000000000000000000000000000000000..10fa14c5ab0134436e2ae435138bf921eb477c60 --- /dev/null +++ b/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/git/hooks/push-to-checkout.sample b/git/hooks/push-to-checkout.sample new file mode 100644 index 0000000000000000000000000000000000000000..af5a0c0018b5e9c04b56ac52f21b4d28f48d99ea --- /dev/null +++ b/git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/git/index b/git/index new file mode 100644 index 0000000000000000000000000000000000000000..aff5bc0d115255699040abdf8d014bd78e471d51 Binary files /dev/null and b/git/index differ diff --git a/git/info/exclude b/git/info/exclude new file mode 100644 index 0000000000000000000000000000000000000000..a5196d1be8fb59edf8062bef36d3a602e0812139 --- /dev/null +++ b/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/git/logs/HEAD b/git/logs/HEAD new file mode 100644 index 0000000000000000000000000000000000000000..201a0600d251633f50052b009a655132b9898c01 --- /dev/null +++ b/git/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 ee167eabe8e02e39385d02d109cec2a5ac5718fd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1670012014 -0800 clone: from https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git +ee167eabe8e02e39385d02d109cec2a5ac5718fd 964437afd04d814d90bdf55fd6672a4c78446bf4 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1671791626 -0800 reset: moving to origin +964437afd04d814d90bdf55fd6672a4c78446bf4 988aaab6678b9ab515cd24756b71a2d4073830cd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672353167 -0800 reset: moving to origin +988aaab6678b9ab515cd24756b71a2d4073830cd 3b8f68acc6cd7426257bae5ea32dcff0653f44c3 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672950005 -0800 reset: moving to origin +3b8f68acc6cd7426257bae5ea32dcff0653f44c3 4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674535116 -0800 reset: moving to origin +4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd a9eacb1eff904552d3012babfa28b57e1d3e295c ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674675337 -0800 pull: Fast-forward diff --git a/git/logs/refs/heads/master b/git/logs/refs/heads/master new file mode 100644 index 0000000000000000000000000000000000000000..201a0600d251633f50052b009a655132b9898c01 --- /dev/null +++ b/git/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 ee167eabe8e02e39385d02d109cec2a5ac5718fd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1670012014 -0800 clone: from https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git +ee167eabe8e02e39385d02d109cec2a5ac5718fd 964437afd04d814d90bdf55fd6672a4c78446bf4 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1671791626 -0800 reset: moving to origin +964437afd04d814d90bdf55fd6672a4c78446bf4 988aaab6678b9ab515cd24756b71a2d4073830cd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672353167 -0800 reset: moving to origin +988aaab6678b9ab515cd24756b71a2d4073830cd 3b8f68acc6cd7426257bae5ea32dcff0653f44c3 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672950005 -0800 reset: moving to origin +3b8f68acc6cd7426257bae5ea32dcff0653f44c3 4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674535116 -0800 reset: moving to origin +4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd a9eacb1eff904552d3012babfa28b57e1d3e295c ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674675337 -0800 pull: Fast-forward diff --git a/git/logs/refs/remotes/origin/HEAD b/git/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000000000000000000000000000000000000..5cc59bb2abf0f53c96be42ddb16d5e6cfd38b92b --- /dev/null +++ b/git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 ee167eabe8e02e39385d02d109cec2a5ac5718fd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1670012014 -0800 clone: from https://github.com/toriato/stable-diffusion-webui-wd14-tagger.git diff --git a/git/logs/refs/remotes/origin/master b/git/logs/refs/remotes/origin/master new file mode 100644 index 0000000000000000000000000000000000000000..ffce25498a336e2e43e521a6e12170c2528b516f --- /dev/null +++ b/git/logs/refs/remotes/origin/master @@ -0,0 +1,5 @@ +ee167eabe8e02e39385d02d109cec2a5ac5718fd 964437afd04d814d90bdf55fd6672a4c78446bf4 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1671791625 -0800 fetch --append --no-auto-gc --no-write-commit-graph origin: fast-forward +964437afd04d814d90bdf55fd6672a4c78446bf4 988aaab6678b9ab515cd24756b71a2d4073830cd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672353167 -0800 fetch --append --no-auto-gc --no-write-commit-graph origin: fast-forward +988aaab6678b9ab515cd24756b71a2d4073830cd 3b8f68acc6cd7426257bae5ea32dcff0653f44c3 ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1672950005 -0800 fetch --append --no-auto-gc --no-write-commit-graph origin: fast-forward +3b8f68acc6cd7426257bae5ea32dcff0653f44c3 4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674535116 -0800 fetch --append --no-auto-gc --no-write-commit-graph origin: fast-forward +4bfd84c9f0c3bdc8cb5c3fbb22374aab04c845dd a9eacb1eff904552d3012babfa28b57e1d3e295c ZackCaz3d <91353623+ZackCaz3d@users.noreply.github.com> 1674675337 -0800 pull: fast-forward diff --git a/git/objects/01/05f2f3b9e71e71f1d472e03c2c8741572fe29e b/git/objects/01/05f2f3b9e71e71f1d472e03c2c8741572fe29e new file mode 100644 index 0000000000000000000000000000000000000000..65462cc7e0e62e38138d1548975d592a2fdce2d1 Binary files /dev/null and b/git/objects/01/05f2f3b9e71e71f1d472e03c2c8741572fe29e differ diff --git a/git/objects/01/63a104748fab4c15eb4ada6661b447ddeea0ee b/git/objects/01/63a104748fab4c15eb4ada6661b447ddeea0ee new file mode 100644 index 0000000000000000000000000000000000000000..58a62900ccd5c693ed578de22903b14a875a3b76 Binary files /dev/null and b/git/objects/01/63a104748fab4c15eb4ada6661b447ddeea0ee differ diff --git a/git/objects/03/32fd33d1f6307a135ad87c54825b82dbd48c4e b/git/objects/03/32fd33d1f6307a135ad87c54825b82dbd48c4e new file mode 100644 index 0000000000000000000000000000000000000000..3bf4afc161e970f03aab629c6f65bc69e39b47ab Binary files /dev/null and b/git/objects/03/32fd33d1f6307a135ad87c54825b82dbd48c4e differ diff --git a/git/objects/06/8cdcc0352348634e259d15e1c194ebb2625040 b/git/objects/06/8cdcc0352348634e259d15e1c194ebb2625040 new file mode 100644 index 0000000000000000000000000000000000000000..873e6692ff4fbd134dfb61d7bb07cb8a3393a009 Binary files /dev/null and b/git/objects/06/8cdcc0352348634e259d15e1c194ebb2625040 differ diff --git a/git/objects/0b/11711a5c7b48cbd8eabc36df8676649be96fb9 b/git/objects/0b/11711a5c7b48cbd8eabc36df8676649be96fb9 new file mode 100644 index 0000000000000000000000000000000000000000..89eff2639d2b6887783dc3d07913e46e03e71cd5 Binary files /dev/null and b/git/objects/0b/11711a5c7b48cbd8eabc36df8676649be96fb9 differ diff --git a/git/objects/0b/77e4e14f2957a225e3d8cc7ec33062d2276981 b/git/objects/0b/77e4e14f2957a225e3d8cc7ec33062d2276981 new file mode 100644 index 0000000000000000000000000000000000000000..d0586c950194b4e14a8213c6463859fb2cd7ea19 Binary files /dev/null and b/git/objects/0b/77e4e14f2957a225e3d8cc7ec33062d2276981 differ diff --git a/git/objects/0c/92e98ace3ef1ebbd08c2594746b94f6373b510 b/git/objects/0c/92e98ace3ef1ebbd08c2594746b94f6373b510 new file mode 100644 index 0000000000000000000000000000000000000000..41f0091fbea6331b95b378ee708ff65c09c81673 Binary files /dev/null and b/git/objects/0c/92e98ace3ef1ebbd08c2594746b94f6373b510 differ diff --git a/git/objects/0d/b4b476e2802f673aa1e322c3301071e664c426 b/git/objects/0d/b4b476e2802f673aa1e322c3301071e664c426 new file mode 100644 index 0000000000000000000000000000000000000000..6c79b4c17e1471a96343c7621203e73e9143bfc6 --- /dev/null +++ b/git/objects/0d/b4b476e2802f673aa1e322c3301071e664c426 @@ -0,0 +1 @@ +x+)JMU04f040031QHI--)+d0V3٨0c-Bo}rK@#'h1nRBPEy%EE%E w7z^&eT4RJ RS|J4ڢ-f{gJ*;EۚxEKhOd \ No newline at end of file diff --git a/git/objects/12/f6acc217b52f62dd13a989675716a26e5791f1 b/git/objects/12/f6acc217b52f62dd13a989675716a26e5791f1 new file mode 100644 index 0000000000000000000000000000000000000000..7f810372eb368ac57bbf898de7a132d93d117356 Binary files /dev/null and b/git/objects/12/f6acc217b52f62dd13a989675716a26e5791f1 differ diff --git a/git/objects/14/2e7a0b7592d981c97186fc9a5b1e5a1a3a4e88 b/git/objects/14/2e7a0b7592d981c97186fc9a5b1e5a1a3a4e88 new file mode 100644 index 0000000000000000000000000000000000000000..1a02c2e8a0b43fa5afd67a0d7df4304f6f20f669 Binary files /dev/null and b/git/objects/14/2e7a0b7592d981c97186fc9a5b1e5a1a3a4e88 differ diff --git a/git/objects/14/a8c2f6a3fcae16628d854e3353e2eaac6397dd b/git/objects/14/a8c2f6a3fcae16628d854e3353e2eaac6397dd new file mode 100644 index 0000000000000000000000000000000000000000..540f2315969c89691f4ac1112c56b4cc9001c780 Binary files /dev/null and b/git/objects/14/a8c2f6a3fcae16628d854e3353e2eaac6397dd differ diff --git a/git/objects/15/eca6f75004fc7e25a4ae6b44e93665d723010e b/git/objects/15/eca6f75004fc7e25a4ae6b44e93665d723010e new file mode 100644 index 0000000000000000000000000000000000000000..5665d69b3c88ac541cf12588af269d2737160939 --- /dev/null +++ b/git/objects/15/eca6f75004fc7e25a4ae6b44e93665d723010e @@ -0,0 +1,2 @@ +x s +">b(J5?1r}hŒڤxiY!MH-+bp6jqP彃02npZ@=I!S\bAHζ*? wW=ZikδnXSjUD_{aXQy-w=\e,xJ \ No newline at end of file diff --git a/git/objects/17/8f6520fefed9050d43269b5713a63a55b1f51a b/git/objects/17/8f6520fefed9050d43269b5713a63a55b1f51a new file mode 100644 index 0000000000000000000000000000000000000000..c0f25a776e3dad09326a4f304facd6a65ad173a9 Binary files /dev/null and b/git/objects/17/8f6520fefed9050d43269b5713a63a55b1f51a differ diff --git a/git/objects/1a/c9ef767c751f8528e310c0a023f044e364d0e2 b/git/objects/1a/c9ef767c751f8528e310c0a023f044e364d0e2 new file mode 100644 index 0000000000000000000000000000000000000000..f6d2fa495f6144ea3491e9299fe0730a2cfae2be Binary files /dev/null and b/git/objects/1a/c9ef767c751f8528e310c0a023f044e364d0e2 differ diff --git a/git/objects/1e/91cc875540decf6e54058349ca4e848a15d7f7 b/git/objects/1e/91cc875540decf6e54058349ca4e848a15d7f7 new file mode 100644 index 0000000000000000000000000000000000000000..3d1b7ba7aaaa52eb4fb3cf5ba1c0b020a612a767 Binary files /dev/null and b/git/objects/1e/91cc875540decf6e54058349ca4e848a15d7f7 differ diff --git a/git/objects/20/80cf2c0fafb9fb863b169b558f64c930bfa1d3 b/git/objects/20/80cf2c0fafb9fb863b169b558f64c930bfa1d3 new file mode 100644 index 0000000000000000000000000000000000000000..29f654f976685116708d1a4713acbf8e48262da3 Binary files /dev/null and b/git/objects/20/80cf2c0fafb9fb863b169b558f64c930bfa1d3 differ diff --git a/git/objects/20/a08aba96fac9e37990db0ce1b40c6dd77dfb00 b/git/objects/20/a08aba96fac9e37990db0ce1b40c6dd77dfb00 new file mode 100644 index 0000000000000000000000000000000000000000..accdab2c060cf026cbd6e84e536f041a6ba46103 --- /dev/null +++ b/git/objects/20/a08aba96fac9e37990db0ce1b40c6dd77dfb00 @@ -0,0 +1 @@ +xO;N0)mO!3رhOV м}C]҅7f-&IX)T&r.bcTp9A`)@grӟ ~ =0mC*30 @ #1wv3GlЇ@Q=.0`brLh}NiЉ2 +O3OHRr6Z\+11I'UsCj\p25YI(37P* \ No newline at end of file diff --git a/git/objects/25/c078eaaa6805507009d2d5ed8cfc5e7a924aae b/git/objects/25/c078eaaa6805507009d2d5ed8cfc5e7a924aae new file mode 100644 index 0000000000000000000000000000000000000000..3649b05c5f68a151f167c4b557ba2bfc3af56334 Binary files /dev/null and b/git/objects/25/c078eaaa6805507009d2d5ed8cfc5e7a924aae differ diff --git a/git/objects/28/4591e949d9d32afb572c7bedea9a37106f7a8f b/git/objects/28/4591e949d9d32afb572c7bedea9a37106f7a8f new file mode 100644 index 0000000000000000000000000000000000000000..2847891debde3cea9678736698088a6375387ce6 Binary files /dev/null and b/git/objects/28/4591e949d9d32afb572c7bedea9a37106f7a8f differ diff --git a/git/objects/28/52056ca941163a5a7cc7e4d565d41684e5b897 b/git/objects/28/52056ca941163a5a7cc7e4d565d41684e5b897 new file mode 100644 index 0000000000000000000000000000000000000000..54b28cd421574accc83dabde6c3b603d85c0de67 Binary files /dev/null and b/git/objects/28/52056ca941163a5a7cc7e4d565d41684e5b897 differ diff --git a/git/objects/29/50e37ec4b9fb8c83c528216b88929af0c442a1 b/git/objects/29/50e37ec4b9fb8c83c528216b88929af0c442a1 new file mode 100644 index 0000000000000000000000000000000000000000..5c08c8f89f05f4bfbb26d8dbf32b254667303097 Binary files /dev/null and b/git/objects/29/50e37ec4b9fb8c83c528216b88929af0c442a1 differ diff --git a/git/objects/2a/e95728447650be46291b43abba59bd53f243b3 b/git/objects/2a/e95728447650be46291b43abba59bd53f243b3 new file mode 100644 index 0000000000000000000000000000000000000000..9952e55cf24e3cbee02d4774a42ea56b4b453464 Binary files /dev/null and b/git/objects/2a/e95728447650be46291b43abba59bd53f243b3 differ diff --git a/git/objects/2d/5ed84f6eaa3b61e887e976270298420c152e6f b/git/objects/2d/5ed84f6eaa3b61e887e976270298420c152e6f new file mode 100644 index 0000000000000000000000000000000000000000..8d766b99a30cbd5859a4b671e487efc675e6c522 Binary files /dev/null and b/git/objects/2d/5ed84f6eaa3b61e887e976270298420c152e6f differ diff --git a/git/objects/34/4db9dc3ae2521a926b662906014281b3049936 b/git/objects/34/4db9dc3ae2521a926b662906014281b3049936 new file mode 100644 index 0000000000000000000000000000000000000000..22d9e355ec8720d58c15fbd4de232be00fef4c7b Binary files /dev/null and b/git/objects/34/4db9dc3ae2521a926b662906014281b3049936 differ diff --git a/git/objects/35/6e71f0a19490840bf7ece55e688cbfc80d16e1 b/git/objects/35/6e71f0a19490840bf7ece55e688cbfc80d16e1 new file mode 100644 index 0000000000000000000000000000000000000000..4fa9db5269ed6dd9545fff4e65c453d83a797443 Binary files /dev/null and b/git/objects/35/6e71f0a19490840bf7ece55e688cbfc80d16e1 differ diff --git a/git/objects/36/a585812eeeacda8465511ff714829a08965d50 b/git/objects/36/a585812eeeacda8465511ff714829a08965d50 new file mode 100644 index 0000000000000000000000000000000000000000..19c32dae64536c2840871f40b429a43d8967ad1c --- /dev/null +++ b/git/objects/36/a585812eeeacda8465511ff714829a08965d50 @@ -0,0 +1,2 @@ +x=A +0D)fgV(HQLM_Ho ޲N;)~A{Nx1f7ҏ([P<󬉟M8_}l jcF:(NP&.(/, \ No newline at end of file diff --git a/git/objects/3b/8f68acc6cd7426257bae5ea32dcff0653f44c3 b/git/objects/3b/8f68acc6cd7426257bae5ea32dcff0653f44c3 new file mode 100644 index 0000000000000000000000000000000000000000..7227b844700bd1e8681dda9ee7cb4a00f9cdb1f7 Binary files /dev/null and b/git/objects/3b/8f68acc6cd7426257bae5ea32dcff0653f44c3 differ diff --git a/git/objects/3d/ca5fc17c36d69e954df7a1d37b79885ea0c118 b/git/objects/3d/ca5fc17c36d69e954df7a1d37b79885ea0c118 new file mode 100644 index 0000000000000000000000000000000000000000..de72daee02d89ac387c0a92842494ca6b11a21fb Binary files /dev/null and b/git/objects/3d/ca5fc17c36d69e954df7a1d37b79885ea0c118 differ diff --git a/git/objects/3e/e98597fbd135b306cd480c95b79adc8e660ae4 b/git/objects/3e/e98597fbd135b306cd480c95b79adc8e660ae4 new file mode 100644 index 0000000000000000000000000000000000000000..6c90e2d11746d9a3a592cb3c26850df8b4fb40d7 Binary files /dev/null and b/git/objects/3e/e98597fbd135b306cd480c95b79adc8e660ae4 differ diff --git a/git/objects/3f/19b0ed40e3bbebd5a13055f47ac9f5078e5bab b/git/objects/3f/19b0ed40e3bbebd5a13055f47ac9f5078e5bab new file mode 100644 index 0000000000000000000000000000000000000000..af04597c7b1a29a4c6398f0e88da478a058085e8 --- /dev/null +++ b/git/objects/3f/19b0ed40e3bbebd5a13055f47ac9f5078e5bab @@ -0,0 +1 @@ +xuMk0{ί K)-m)˲RJ֌@463W]D/x;9[wC] |mMԭ 87S!];YLfCh $k۫ r*FԾqXf d/j]CYn%(]߆aqfPM%o[ST +](5,lZȵ-M19CD0XFK%lד_4p |?*X]:9\,\} ď,Mi c$l'䀧ӺNP: žϖovAZCt>50UjMmf>}zn֮h'c=sU5 ]QyLjiTg+[^ܟv_3?t^"|/^9f4@ލ/"^C6 wEyfIw˻̆(dqCqp-xLw$0\U[fg3S4K87%4䅷NK#2tNO"lQxֵ{ d]1홋?K\PS:H!MV Um xөJ|$^7H + \ No newline at end of file diff --git a/git/objects/4c/7d0b4d322ad36f885ce8ac716dbf8901360d6a b/git/objects/4c/7d0b4d322ad36f885ce8ac716dbf8901360d6a new file mode 100644 index 0000000000000000000000000000000000000000..d3f9f3791926d5a7c3c60a0e4b6e6d5729a52afe --- /dev/null +++ b/git/objects/4c/7d0b4d322ad36f885ce8ac716dbf8901360d6a @@ -0,0 +1,4 @@ +xK +@])z/p zfq$7gުW +NWf, mq +/8R Vyɑmar)>U+[DpR'י_ƅ .. )֚nqMu?g7?BI \ No newline at end of file diff --git a/git/objects/4f/8c1fe944c1a884db2dff303f188ab403c671f9 b/git/objects/4f/8c1fe944c1a884db2dff303f188ab403c671f9 new file mode 100644 index 0000000000000000000000000000000000000000..702b361028b08f85e52aa9ece87e8b8e2a8cb594 Binary files /dev/null and b/git/objects/4f/8c1fe944c1a884db2dff303f188ab403c671f9 differ diff --git a/git/objects/53/436d489032ef23e3cc5ea41947eb958099d09e b/git/objects/53/436d489032ef23e3cc5ea41947eb958099d09e new file mode 100644 index 0000000000000000000000000000000000000000..0d562766d8858794e7e35bf8ebdd4f7626171251 --- /dev/null +++ b/git/objects/53/436d489032ef23e3cc5ea41947eb958099d09e @@ -0,0 +1,2 @@ +xKn0 D)P0~ '~ +l+cVKGk5[BP>&9%yƀ%Gs6fIRϞ{%Bbk18G)=:tZ6Y?p g #NCmٚ:y9vv*TQ1oTK \ No newline at end of file diff --git a/git/objects/5a/12809e24d5bc740a1da3fe096ec6eafe4fb62f b/git/objects/5a/12809e24d5bc740a1da3fe096ec6eafe4fb62f new file mode 100644 index 0000000000000000000000000000000000000000..a717aab89f267d6c33e193c5c46fbe875d152125 Binary files /dev/null and b/git/objects/5a/12809e24d5bc740a1da3fe096ec6eafe4fb62f differ diff --git a/git/objects/5b/c26b91187209dfc00c96ea9c21ee33dfa4704c b/git/objects/5b/c26b91187209dfc00c96ea9c21ee33dfa4704c new file mode 100644 index 0000000000000000000000000000000000000000..505966891fc427326b963acc55ad77fafbf4b470 Binary files /dev/null and b/git/objects/5b/c26b91187209dfc00c96ea9c21ee33dfa4704c differ diff --git a/git/objects/5c/95ab5a25b6f689723cfc386ec38ef2ebd5116c b/git/objects/5c/95ab5a25b6f689723cfc386ec38ef2ebd5116c new file mode 100644 index 0000000000000000000000000000000000000000..ee7340a8b60d5bab4e39ecadcfdb412311fdb2be Binary files /dev/null and b/git/objects/5c/95ab5a25b6f689723cfc386ec38ef2ebd5116c differ diff --git a/git/objects/5f/280dc89b76efde1613a420b54440893c786d71 b/git/objects/5f/280dc89b76efde1613a420b54440893c786d71 new file mode 100644 index 0000000000000000000000000000000000000000..9daa7f84b0a1724530aae1762e4955b11c45e0eb Binary files /dev/null and b/git/objects/5f/280dc89b76efde1613a420b54440893c786d71 differ diff --git a/git/objects/5f/e1a6e08a2f89e6356f198cf76f9e3b530d34fe b/git/objects/5f/e1a6e08a2f89e6356f198cf76f9e3b530d34fe new file mode 100644 index 0000000000000000000000000000000000000000..361a84272552f78d067c3c5854a55201194d3b0c Binary files /dev/null and b/git/objects/5f/e1a6e08a2f89e6356f198cf76f9e3b530d34fe differ diff --git a/git/objects/60/c8393e0c6e59e7469dea95d38394f08d958712 b/git/objects/60/c8393e0c6e59e7469dea95d38394f08d958712 new file mode 100644 index 0000000000000000000000000000000000000000..5339dc4f823b3650192670d51be6d6abf36d516c Binary files /dev/null and b/git/objects/60/c8393e0c6e59e7469dea95d38394f08d958712 differ diff --git a/git/objects/60/e0ad0400e68385419f47e6ad87bbb0d12dea85 b/git/objects/60/e0ad0400e68385419f47e6ad87bbb0d12dea85 new file mode 100644 index 0000000000000000000000000000000000000000..120ba39571ef4721664b2958537219da9d6ce983 Binary files /dev/null and b/git/objects/60/e0ad0400e68385419f47e6ad87bbb0d12dea85 differ diff --git a/git/objects/62/617f3a72d1f3a482f757ec8198cd6444c622dc b/git/objects/62/617f3a72d1f3a482f757ec8198cd6444c622dc new file mode 100644 index 0000000000000000000000000000000000000000..633ca15f591944d99261aa54d6c1dfe767ce1b84 Binary files /dev/null and b/git/objects/62/617f3a72d1f3a482f757ec8198cd6444c622dc differ diff --git a/git/objects/64/892efd3334a9d8ab0e6921669d6c70c44dadd4 b/git/objects/64/892efd3334a9d8ab0e6921669d6c70c44dadd4 new file mode 100644 index 0000000000000000000000000000000000000000..709f70499b2797f99d590b27dd2af400acce866d Binary files /dev/null and b/git/objects/64/892efd3334a9d8ab0e6921669d6c70c44dadd4 differ diff --git a/git/objects/64/8ae86a6d68e5750de65e8462c4bfab3047e0be b/git/objects/64/8ae86a6d68e5750de65e8462c4bfab3047e0be new file mode 100644 index 0000000000000000000000000000000000000000..bb3d982badcfee6ff7967e7c5630e516f0db861d Binary files /dev/null and b/git/objects/64/8ae86a6d68e5750de65e8462c4bfab3047e0be differ diff --git a/git/objects/68/01d7d0b8c90a75cf2fab98e2d66e9833e64da6 b/git/objects/68/01d7d0b8c90a75cf2fab98e2d66e9833e64da6 new file mode 100644 index 0000000000000000000000000000000000000000..05b47326206e091f357aa4ef6e0514fc6e60585d Binary files /dev/null and b/git/objects/68/01d7d0b8c90a75cf2fab98e2d66e9833e64da6 differ diff --git a/git/objects/68/a2eae372100989774f543f88a0d9124d5c7c44 b/git/objects/68/a2eae372100989774f543f88a0d9124d5c7c44 new file mode 100644 index 0000000000000000000000000000000000000000..b83ff2d06f79996e8bc921c656e019d209e47e53 Binary files /dev/null and b/git/objects/68/a2eae372100989774f543f88a0d9124d5c7c44 differ diff --git a/git/objects/69/9cf27ba58a8fb59fd33029420ea5fde36b080a b/git/objects/69/9cf27ba58a8fb59fd33029420ea5fde36b080a new file mode 100644 index 0000000000000000000000000000000000000000..8e2fe5bdbc61f8c78646377aab04894049bd0390 Binary files /dev/null and b/git/objects/69/9cf27ba58a8fb59fd33029420ea5fde36b080a differ diff --git a/git/objects/6c/2006f0749ff863c99e1aeeb4212c7f155f398b b/git/objects/6c/2006f0749ff863c99e1aeeb4212c7f155f398b new file mode 100644 index 0000000000000000000000000000000000000000..7662d63181cf25b865b534af457caa527e643876 --- /dev/null +++ b/git/objects/6c/2006f0749ff863c99e1aeeb4212c7f155f398b @@ -0,0 +1,4 @@ +xKj1 @)/)B =@w=F'z&\͡ + +&ԖOk*9e~y1A +j#qI^|(0¸.rRsv}>MOw~ cxǂNzN6rݸB;l('ȧQP \ No newline at end of file diff --git a/git/objects/70/ed62f63236a2ad11912db2edce83d1947f2bc7 b/git/objects/70/ed62f63236a2ad11912db2edce83d1947f2bc7 new file mode 100644 index 0000000000000000000000000000000000000000..03d7fe9814cf658094062413e13dd40386379fad Binary files /dev/null and b/git/objects/70/ed62f63236a2ad11912db2edce83d1947f2bc7 differ diff --git a/git/objects/71/7db49f990511d38c9ea8af86a5ae4f629cb6c4 b/git/objects/71/7db49f990511d38c9ea8af86a5ae4f629cb6c4 new file mode 100644 index 0000000000000000000000000000000000000000..45ac0b89e8330ded44c98f66df720a3f656722e3 Binary files /dev/null and b/git/objects/71/7db49f990511d38c9ea8af86a5ae4f629cb6c4 differ diff --git a/git/objects/78/df49d244d613e0ae74d7782edce665704e2531 b/git/objects/78/df49d244d613e0ae74d7782edce665704e2531 new file mode 100644 index 0000000000000000000000000000000000000000..4541cd062dc19e59a953fd153760daddd9649951 Binary files /dev/null and b/git/objects/78/df49d244d613e0ae74d7782edce665704e2531 differ diff --git a/git/objects/79/e97c8eaa34adfb78812fb6fc44ac547fc21e5c b/git/objects/79/e97c8eaa34adfb78812fb6fc44ac547fc21e5c new file mode 100644 index 0000000000000000000000000000000000000000..8bc1ee05ce1aa2a358fdaadc57cabcda77b8035a Binary files /dev/null and b/git/objects/79/e97c8eaa34adfb78812fb6fc44ac547fc21e5c differ diff --git a/git/objects/7a/b57bcfb8570d9e47276920f2fa22158e4cfff6 b/git/objects/7a/b57bcfb8570d9e47276920f2fa22158e4cfff6 new file mode 100644 index 0000000000000000000000000000000000000000..ebdd046c1820074a8af22143acc46a43201b29d6 Binary files /dev/null and b/git/objects/7a/b57bcfb8570d9e47276920f2fa22158e4cfff6 differ diff --git a/git/objects/7f/24ecc5e5606cc90221871207437ce049b6dff1 b/git/objects/7f/24ecc5e5606cc90221871207437ce049b6dff1 new file mode 100644 index 0000000000000000000000000000000000000000..b4daf9df3364f8db13ca11ca04a2a30f51c32290 Binary files /dev/null and b/git/objects/7f/24ecc5e5606cc90221871207437ce049b6dff1 differ diff --git a/git/objects/80/08f8498a2295d7da468ebbe148d09378ccffa7 b/git/objects/80/08f8498a2295d7da468ebbe148d09378ccffa7 new file mode 100644 index 0000000000000000000000000000000000000000..111851c248e6ff23ea9bcb6f62008f550e75b934 Binary files /dev/null and b/git/objects/80/08f8498a2295d7da468ebbe148d09378ccffa7 differ diff --git a/git/objects/82/d7905a824b0b1582833decb386d5a08ea8392d b/git/objects/82/d7905a824b0b1582833decb386d5a08ea8392d new file mode 100644 index 0000000000000000000000000000000000000000..6217eecd9487e09ab72990ff99a22db563ad29ef Binary files /dev/null and b/git/objects/82/d7905a824b0b1582833decb386d5a08ea8392d differ diff --git a/git/objects/84/baf05bbc8a3eb21cf27d23032e8771d59c8569 b/git/objects/84/baf05bbc8a3eb21cf27d23032e8771d59c8569 new file mode 100644 index 0000000000000000000000000000000000000000..79cf4671cd892f7115e91ee6581147f041165f95 Binary files /dev/null and b/git/objects/84/baf05bbc8a3eb21cf27d23032e8771d59c8569 differ diff --git a/git/objects/8a/7559d076b6b020ea1151e924d23ef50487fc75 b/git/objects/8a/7559d076b6b020ea1151e924d23ef50487fc75 new file mode 100644 index 0000000000000000000000000000000000000000..93cb91951772ce0dab41bfad666cef12d9324ff3 Binary files /dev/null and b/git/objects/8a/7559d076b6b020ea1151e924d23ef50487fc75 differ diff --git a/git/objects/8a/da364f7347ef2cdfe7e28105a8a18f7ff9f2ea b/git/objects/8a/da364f7347ef2cdfe7e28105a8a18f7ff9f2ea new file mode 100644 index 0000000000000000000000000000000000000000..990de63a47f7af94c87a70f9d12e802d0237537a Binary files /dev/null and b/git/objects/8a/da364f7347ef2cdfe7e28105a8a18f7ff9f2ea differ diff --git a/git/objects/8b/2cf49a1cf5b79a6bc3a00916dea2943f1b6fdd b/git/objects/8b/2cf49a1cf5b79a6bc3a00916dea2943f1b6fdd new file mode 100644 index 0000000000000000000000000000000000000000..49b5d2f5766cf6d3cd2c68d774d3920d02805b2d Binary files /dev/null and b/git/objects/8b/2cf49a1cf5b79a6bc3a00916dea2943f1b6fdd differ diff --git a/git/objects/8c/d09ee46759351fefb34a25e00da64d57d388bf b/git/objects/8c/d09ee46759351fefb34a25e00da64d57d388bf new file mode 100644 index 0000000000000000000000000000000000000000..292131fada4a513d2e2966e83b0d6037f359367f --- /dev/null +++ b/git/objects/8c/d09ee46759351fefb34a25e00da64d57d388bf @@ -0,0 +1 @@ +x+)JMU04f040031QHI--)+d0V3٨0c-Bo}rK@#'h1nRBPEy%EE%E 1SWGnYd"pߧWsJ RS|J4ڢ-f{gJ*;EۚxEKP \ No newline at end of file diff --git a/git/objects/8e/f87ffbf53b1d271961eca75ff1beda31a859ca b/git/objects/8e/f87ffbf53b1d271961eca75ff1beda31a859ca new file mode 100644 index 0000000000000000000000000000000000000000..c89f150bc79802c8dc61d6cda169b209f309fc1b Binary files /dev/null and b/git/objects/8e/f87ffbf53b1d271961eca75ff1beda31a859ca differ diff --git a/git/objects/95/3517f0b2c5b6ab5b41be986bf6dcde44ea3438 b/git/objects/95/3517f0b2c5b6ab5b41be986bf6dcde44ea3438 new file mode 100644 index 0000000000000000000000000000000000000000..b86807e7e5427d605541d50fd6651ca817867465 Binary files /dev/null and b/git/objects/95/3517f0b2c5b6ab5b41be986bf6dcde44ea3438 differ diff --git a/git/objects/96/4437afd04d814d90bdf55fd6672a4c78446bf4 b/git/objects/96/4437afd04d814d90bdf55fd6672a4c78446bf4 new file mode 100644 index 0000000000000000000000000000000000000000..2e2b9d27f63a0043db21f4b4dea9e8930d2c1625 Binary files /dev/null and b/git/objects/96/4437afd04d814d90bdf55fd6672a4c78446bf4 differ diff --git a/git/objects/98/8aaab6678b9ab515cd24756b71a2d4073830cd b/git/objects/98/8aaab6678b9ab515cd24756b71a2d4073830cd new file mode 100644 index 0000000000000000000000000000000000000000..6ac767b3b188339d6c90d6513da8eb69ea9c9192 Binary files /dev/null and b/git/objects/98/8aaab6678b9ab515cd24756b71a2d4073830cd differ diff --git a/git/objects/9d/b235b36ff7c3855784b17e44b948370b9b1760 b/git/objects/9d/b235b36ff7c3855784b17e44b948370b9b1760 new file mode 100644 index 0000000000000000000000000000000000000000..3b49e8ec6352bbecfe8504fe5f8d6d6b73831d83 --- /dev/null +++ b/git/objects/9d/b235b36ff7c3855784b17e44b948370b9b1760 @@ -0,0 +1 @@ +x+)JMU062e040031QK,L/Jezr*s0ܙS [{ӦD@U:e0MfdhDMo5_R}UP={cElZrD\ PHO.ftG{l/V{r,^S7C2 JY?}\㕢6:A-*(JOL+d'afnf^ r27 FA)fzRMSyȽ7C).IK..fXb]\x3D!Ɣ$1lk M6xC^{)QzNK~ \ No newline at end of file diff --git a/git/objects/9f/1e3e71199f7f43213767d92d81f36e78900335 b/git/objects/9f/1e3e71199f7f43213767d92d81f36e78900335 new file mode 100644 index 0000000000000000000000000000000000000000..e66588b86800dbe218bd3bd5ac08a85f0c4eaa1c Binary files /dev/null and b/git/objects/9f/1e3e71199f7f43213767d92d81f36e78900335 differ diff --git a/git/objects/a4/3b73754a5621cc81faafb141991615732e1687 b/git/objects/a4/3b73754a5621cc81faafb141991615732e1687 new file mode 100644 index 0000000000000000000000000000000000000000..f00b5698062adb48e80b1211cdb660003b4f355c Binary files /dev/null and b/git/objects/a4/3b73754a5621cc81faafb141991615732e1687 differ diff --git a/git/objects/a4/eb9ecf9a8212a99308a99b793da0e9da1044a5 b/git/objects/a4/eb9ecf9a8212a99308a99b793da0e9da1044a5 new file mode 100644 index 0000000000000000000000000000000000000000..6a8d1b526c1e57a7990fa7a14922d627d7ff1529 Binary files /dev/null and b/git/objects/a4/eb9ecf9a8212a99308a99b793da0e9da1044a5 differ diff --git a/git/objects/a7/9b5c0236bfa9e3569a4e5b3f8eec334836f548 b/git/objects/a7/9b5c0236bfa9e3569a4e5b3f8eec334836f548 new file mode 100644 index 0000000000000000000000000000000000000000..c6f0d012fafc8f586a21724e3226ea7fe66d6c35 Binary files /dev/null and b/git/objects/a7/9b5c0236bfa9e3569a4e5b3f8eec334836f548 differ diff --git a/git/objects/a9/eacb1eff904552d3012babfa28b57e1d3e295c b/git/objects/a9/eacb1eff904552d3012babfa28b57e1d3e295c new file mode 100644 index 0000000000000000000000000000000000000000..03c59784709dbecdbd8d28c1177c90fd5aa414c8 Binary files /dev/null and b/git/objects/a9/eacb1eff904552d3012babfa28b57e1d3e295c differ diff --git a/git/objects/ab/7519bc136cf28e16201e9f81b7878eceb7f690 b/git/objects/ab/7519bc136cf28e16201e9f81b7878eceb7f690 new file mode 100644 index 0000000000000000000000000000000000000000..2bbb14b4e7aa7f027bf5bf109361e32950304493 --- /dev/null +++ b/git/objects/ab/7519bc136cf28e16201e9f81b7878eceb7f690 @@ -0,0 +1,2 @@ +xJ1=).+N`"{I:@22=>9 x-ʷZ39D,}^F6Bqj \ No newline at end of file diff --git a/git/objects/ac/a6753776bf8d9eedb112dacbe1e36d50c915f9 b/git/objects/ac/a6753776bf8d9eedb112dacbe1e36d50c915f9 new file mode 100644 index 0000000000000000000000000000000000000000..cd60ab28a77a4585852f4a62fd3024544937eeb5 Binary files /dev/null and b/git/objects/ac/a6753776bf8d9eedb112dacbe1e36d50c915f9 differ diff --git a/git/objects/ae/f0ddcacdb12bd4ae081e19df56c3695c50d84f b/git/objects/ae/f0ddcacdb12bd4ae081e19df56c3695c50d84f new file mode 100644 index 0000000000000000000000000000000000000000..e10e82f9069d7601662c4355185322238f725233 --- /dev/null +++ b/git/objects/ae/f0ddcacdb12bd4ae081e19df56c3695c50d84f @@ -0,0 +1 @@ +xIn0s+n 2$#j8TD@  jZX4ҘAv:C~HƳ!3 kjH(ust6Q:xɩ`uTV3LB4pЃ֊^P\E x^gh,{%NM4 \ No newline at end of file diff --git a/git/objects/b0/e6e700741963e9d95f3872d3780dfbf3911945 b/git/objects/b0/e6e700741963e9d95f3872d3780dfbf3911945 new file mode 100644 index 0000000000000000000000000000000000000000..c5d48e49bdb0edde1324b67112cc38f4a28f4ff0 Binary files /dev/null and b/git/objects/b0/e6e700741963e9d95f3872d3780dfbf3911945 differ diff --git a/git/objects/b3/9a53aab22078b4ff4b23b7053286e3bdddc32c b/git/objects/b3/9a53aab22078b4ff4b23b7053286e3bdddc32c new file mode 100644 index 0000000000000000000000000000000000000000..a011b0d291e13ca50817fe5e0225e7e83d2195c5 Binary files /dev/null and b/git/objects/b3/9a53aab22078b4ff4b23b7053286e3bdddc32c differ diff --git a/git/objects/b3/bb806536354a700dd1f61a32729bcda53695e0 b/git/objects/b3/bb806536354a700dd1f61a32729bcda53695e0 new file mode 100644 index 0000000000000000000000000000000000000000..f0000790539175d666aaf170a12d8cdb5cff845a Binary files /dev/null and b/git/objects/b3/bb806536354a700dd1f61a32729bcda53695e0 differ diff --git a/git/objects/b4/93bffef7c346356604ace05ac0dc4b2d9b4ead b/git/objects/b4/93bffef7c346356604ace05ac0dc4b2d9b4ead new file mode 100644 index 0000000000000000000000000000000000000000..c5937312e110dd7b5c6fa462b756944d4deeae9c Binary files /dev/null and b/git/objects/b4/93bffef7c346356604ace05ac0dc4b2d9b4ead differ diff --git a/git/objects/b6/85556334d0e3b06e5a08ef2aa7645a4f2e42a5 b/git/objects/b6/85556334d0e3b06e5a08ef2aa7645a4f2e42a5 new file mode 100644 index 0000000000000000000000000000000000000000..cd635f799c8396cffd4a0c193c4aa6518ed2736e Binary files /dev/null and b/git/objects/b6/85556334d0e3b06e5a08ef2aa7645a4f2e42a5 differ diff --git a/git/objects/b8/1d0e389c0deed717c24891cf098f137bcee882 b/git/objects/b8/1d0e389c0deed717c24891cf098f137bcee882 new file mode 100644 index 0000000000000000000000000000000000000000..bcba240ce8c45d77ca9f05c88b8b7fc01a4a1376 Binary files /dev/null and b/git/objects/b8/1d0e389c0deed717c24891cf098f137bcee882 differ diff --git a/git/objects/b8/bbc47a4fac6f870d7a53aba67327ae801ee8bd b/git/objects/b8/bbc47a4fac6f870d7a53aba67327ae801ee8bd new file mode 100644 index 0000000000000000000000000000000000000000..6d5f5c0ed95baf7e8e4f48550f36a5208eff3871 Binary files /dev/null and b/git/objects/b8/bbc47a4fac6f870d7a53aba67327ae801ee8bd differ diff --git a/git/objects/b8/eb5cc020d2cd5798b10c5dbe626cd030aa36fb b/git/objects/b8/eb5cc020d2cd5798b10c5dbe626cd030aa36fb new file mode 100644 index 0000000000000000000000000000000000000000..60ea67521891ce2eb3c4f4d49cedd9bd6a6894a8 --- /dev/null +++ b/git/objects/b8/eb5cc020d2cd5798b10c5dbe626cd030aa36fb @@ -0,0 +1 @@ +x+)JMU04f040031QHI--)+d0V3٨0c-Bo}rK@#'h1nRBPEy%EE%E R'ߗՔʷj<8@ J RS|J4ڢ-f{gJ*;EۚxEKPPJ \ No newline at end of file diff --git a/git/objects/b9/f553dbffd43ad12d98e0a0b3a59d63f0d6010b b/git/objects/b9/f553dbffd43ad12d98e0a0b3a59d63f0d6010b new file mode 100644 index 0000000000000000000000000000000000000000..4b239a7cae0add93cad3fbdd693a333f8655558b Binary files /dev/null and b/git/objects/b9/f553dbffd43ad12d98e0a0b3a59d63f0d6010b differ diff --git a/git/objects/ba/b3a949c7dcfb93d33f66a4d570fd0621ff6c97 b/git/objects/ba/b3a949c7dcfb93d33f66a4d570fd0621ff6c97 new file mode 100644 index 0000000000000000000000000000000000000000..73f9c9e26cf74d0206e3fd2b3612f08fe7d044f9 Binary files /dev/null and b/git/objects/ba/b3a949c7dcfb93d33f66a4d570fd0621ff6c97 differ diff --git a/git/objects/bf/c6ec1120d359d0359537ea910af4232ff104c9 b/git/objects/bf/c6ec1120d359d0359537ea910af4232ff104c9 new file mode 100644 index 0000000000000000000000000000000000000000..c6ed37ec6f9a2f5fc2b8528e57d51bfe74d5ef01 Binary files /dev/null and b/git/objects/bf/c6ec1120d359d0359537ea910af4232ff104c9 differ diff --git a/git/objects/c0/64be27d019886e0416f6382fed9bccaf5f1df4 b/git/objects/c0/64be27d019886e0416f6382fed9bccaf5f1df4 new file mode 100644 index 0000000000000000000000000000000000000000..0ecaf96241a1b9e76b663deb12cca9904fbe6533 Binary files /dev/null and b/git/objects/c0/64be27d019886e0416f6382fed9bccaf5f1df4 differ diff --git a/git/objects/c2/e442c7adeda4a0e9c06bac115d202011a38b75 b/git/objects/c2/e442c7adeda4a0e9c06bac115d202011a38b75 new file mode 100644 index 0000000000000000000000000000000000000000..680e7268495ca2c4e33f2d62919ddfbff9680f8a Binary files /dev/null and b/git/objects/c2/e442c7adeda4a0e9c06bac115d202011a38b75 differ diff --git a/git/objects/c6/0701cfae1cdba28134f8a9e2c00f4f541875b4 b/git/objects/c6/0701cfae1cdba28134f8a9e2c00f4f541875b4 new file mode 100644 index 0000000000000000000000000000000000000000..987a3c25bbcb4b751babbcc48c03b983d598444a Binary files /dev/null and b/git/objects/c6/0701cfae1cdba28134f8a9e2c00f4f541875b4 differ diff --git a/git/objects/c6/b00a410024e9f3f583a66e7aff496236525f96 b/git/objects/c6/b00a410024e9f3f583a66e7aff496236525f96 new file mode 100644 index 0000000000000000000000000000000000000000..f268e09782195f5371be44a00ee69f70f554deeb Binary files /dev/null and b/git/objects/c6/b00a410024e9f3f583a66e7aff496236525f96 differ diff --git a/git/objects/c6/e72f32c1c6f718337c956b3dd552822821a6aa b/git/objects/c6/e72f32c1c6f718337c956b3dd552822821a6aa new file mode 100644 index 0000000000000000000000000000000000000000..e54a8929c4e49b2adfa465563b518d79bd7e2240 Binary files /dev/null and b/git/objects/c6/e72f32c1c6f718337c956b3dd552822821a6aa differ diff --git a/git/objects/c7/0d5118aff480cc227f41ddcc8de86df5387094 b/git/objects/c7/0d5118aff480cc227f41ddcc8de86df5387094 new file mode 100644 index 0000000000000000000000000000000000000000..c40ef84931268902fd9ca9eb290173f4921e712a Binary files /dev/null and b/git/objects/c7/0d5118aff480cc227f41ddcc8de86df5387094 differ diff --git a/git/objects/c9/0ef1e815adb6473c359cf06a4a0b410c2a9d88 b/git/objects/c9/0ef1e815adb6473c359cf06a4a0b410c2a9d88 new file mode 100644 index 0000000000000000000000000000000000000000..a3a8d9b7211d7eb61fa6bddb91af7dba3f4b8db2 Binary files /dev/null and b/git/objects/c9/0ef1e815adb6473c359cf06a4a0b410c2a9d88 differ diff --git a/git/objects/cc/1ab8dc297173b82eaafa6f636c778f49c44951 b/git/objects/cc/1ab8dc297173b82eaafa6f636c778f49c44951 new file mode 100644 index 0000000000000000000000000000000000000000..c5d14e8c89fee9b1dab4d5f9a95e3d340e35587b Binary files /dev/null and b/git/objects/cc/1ab8dc297173b82eaafa6f636c778f49c44951 differ diff --git a/git/objects/ce/43eb74bd1460d81f92ae3cd4559c133bea308e b/git/objects/ce/43eb74bd1460d81f92ae3cd4559c133bea308e new file mode 100644 index 0000000000000000000000000000000000000000..86f1d655c08fb2e26aba8c65596e2160ba9ac488 --- /dev/null +++ b/git/objects/ce/43eb74bd1460d81f92ae3cd4559c133bea308e @@ -0,0 +1 @@ +xKj1)zod Z-_!ۂWhk}d 6J5RrZSCbV?8yq1r6Z`1-1<)1&|v ܎/2fGIcᤳGކ+]o4d?Nx \ No newline at end of file diff --git a/git/objects/ce/fa4be70d494f5bee12db32fdacf176fcb7c063 b/git/objects/ce/fa4be70d494f5bee12db32fdacf176fcb7c063 new file mode 100644 index 0000000000000000000000000000000000000000..ab1e85275e90074a9be36e35f2fb1a89eabbdd23 Binary files /dev/null and b/git/objects/ce/fa4be70d494f5bee12db32fdacf176fcb7c063 differ diff --git a/git/objects/d4/846e693abda922fedc4bbf0c70472cdf5053a2 b/git/objects/d4/846e693abda922fedc4bbf0c70472cdf5053a2 new file mode 100644 index 0000000000000000000000000000000000000000..cc1ffac15785c4364db76d6d00ecab5f61c3e026 --- /dev/null +++ b/git/objects/d4/846e693abda922fedc4bbf0c70472cdf5053a2 @@ -0,0 +1,3 @@ +xmJ0S(ps :KڜGӜ0ӛ@JH_Z.azN7x=-OdQD +^J[[3LAE +ePJ̀j8sX iK\~`%=2 A/A]/Dg87j‡/!j(${N-: 4҂&c_::ld \ No newline at end of file diff --git a/git/objects/d5/04be2b9cbc0a7d011429b139978fea2bc99593 b/git/objects/d5/04be2b9cbc0a7d011429b139978fea2bc99593 new file mode 100644 index 0000000000000000000000000000000000000000..75848dcf696853df49083ad710c86f33a2792f3b Binary files /dev/null and b/git/objects/d5/04be2b9cbc0a7d011429b139978fea2bc99593 differ diff --git a/git/objects/d5/ea1aa4ddea38840614f4212540a15eb78751eb b/git/objects/d5/ea1aa4ddea38840614f4212540a15eb78751eb new file mode 100644 index 0000000000000000000000000000000000000000..5e4270d2dc410315eb8213b568904b8dfab2ab2c Binary files /dev/null and b/git/objects/d5/ea1aa4ddea38840614f4212540a15eb78751eb differ diff --git a/git/objects/d6/af99b3b40d2e265f012826ac2b43f5b618dad7 b/git/objects/d6/af99b3b40d2e265f012826ac2b43f5b618dad7 new file mode 100644 index 0000000000000000000000000000000000000000..626fab367c8a6a98760d4b86872295212c6b142e Binary files /dev/null and b/git/objects/d6/af99b3b40d2e265f012826ac2b43f5b618dad7 differ diff --git a/git/objects/da/7ad8a94325b9f50e1db866c8fcbe5301cd7965 b/git/objects/da/7ad8a94325b9f50e1db866c8fcbe5301cd7965 new file mode 100644 index 0000000000000000000000000000000000000000..f2bdf37286a481ef25895acc1e38296781a9d8e6 Binary files /dev/null and b/git/objects/da/7ad8a94325b9f50e1db866c8fcbe5301cd7965 differ diff --git a/git/objects/dd/eccb8645a4762b2420247cc158c432f544ef0a b/git/objects/dd/eccb8645a4762b2420247cc158c432f544ef0a new file mode 100644 index 0000000000000000000000000000000000000000..e65940be06e345a3cb244b4056acab29721ca37e Binary files /dev/null and b/git/objects/dd/eccb8645a4762b2420247cc158c432f544ef0a differ diff --git a/git/objects/de/16bce16976bb0e5803348d4ed01e1c5fd83066 b/git/objects/de/16bce16976bb0e5803348d4ed01e1c5fd83066 new file mode 100644 index 0000000000000000000000000000000000000000..3ab063ef9ab4df44343bc5e4a352a19df8b3e409 --- /dev/null +++ b/git/objects/de/16bce16976bb0e5803348d4ed01e1c5fd83066 @@ -0,0 +1,2 @@ +x]Qn0xR@ +BH Qt!@eeE^,;߽wI`=q-;P6%vJj 'DEamأrЗc=FwR' IL5C0(eV*@MieLQ)D-D{<_ \i׳M դjRi \ No newline at end of file diff --git a/git/objects/e3/d9c07c761ae2d52c2dfb7de326f4081860aa40 b/git/objects/e3/d9c07c761ae2d52c2dfb7de326f4081860aa40 new file mode 100644 index 0000000000000000000000000000000000000000..06b4a948be665b29c816ab5529c8bba936e4ed45 Binary files /dev/null and b/git/objects/e3/d9c07c761ae2d52c2dfb7de326f4081860aa40 differ diff --git a/git/objects/e4/ec460122cf674bbf984df30cdb10b4370c1224 b/git/objects/e4/ec460122cf674bbf984df30cdb10b4370c1224 new file mode 100644 index 0000000000000000000000000000000000000000..59ec2b036b61dffbd5a7764c61ac7ebcf34f1852 Binary files /dev/null and b/git/objects/e4/ec460122cf674bbf984df30cdb10b4370c1224 differ diff --git a/git/objects/e4/fa55846b3738d86284bb489512cccedfd14dfc b/git/objects/e4/fa55846b3738d86284bb489512cccedfd14dfc new file mode 100644 index 0000000000000000000000000000000000000000..84772b128faf34bff0c500125dffb4958b0215c8 Binary files /dev/null and b/git/objects/e4/fa55846b3738d86284bb489512cccedfd14dfc differ diff --git a/git/objects/ea/d941ac6a9474c747c82ff231b54162ca6b66a7 b/git/objects/ea/d941ac6a9474c747c82ff231b54162ca6b66a7 new file mode 100644 index 0000000000000000000000000000000000000000..f0e68150e82a316b7b20c09f88e8a0bb3ec7820e Binary files /dev/null and b/git/objects/ea/d941ac6a9474c747c82ff231b54162ca6b66a7 differ diff --git a/git/objects/ed/5bc122c00b03cb399ac3fc99987e9a2df3fba7 b/git/objects/ed/5bc122c00b03cb399ac3fc99987e9a2df3fba7 new file mode 100644 index 0000000000000000000000000000000000000000..79c34b78af98c20fcd40da572d7ec6af0735a234 --- /dev/null +++ b/git/objects/ed/5bc122c00b03cb399ac3fc99987e9a2df3fba7 @@ -0,0 +1 @@ +xInB1)zyȎ6X& ٖT^m֥D`b[ݩSvt6qz_L'dmt\ [O%W*c%Q-($ES<𽦾@mYy; QGmlpYkz(W:/ <&"RoML \ No newline at end of file diff --git a/git/objects/f2/daf42fe4ea1a1780129bc8d157760033f8e6cf b/git/objects/f2/daf42fe4ea1a1780129bc8d157760033f8e6cf new file mode 100644 index 0000000000000000000000000000000000000000..ba95b3f099e0dd2284e2657955e5d78f07d5b015 Binary files /dev/null and b/git/objects/f2/daf42fe4ea1a1780129bc8d157760033f8e6cf differ diff --git a/git/objects/f5/2a19a32875b4d0bb1e987e1cb60a042b1812cb b/git/objects/f5/2a19a32875b4d0bb1e987e1cb60a042b1812cb new file mode 100644 index 0000000000000000000000000000000000000000..fa7a65cd2a6317516d3a8f44aebaff181b7cff64 Binary files /dev/null and b/git/objects/f5/2a19a32875b4d0bb1e987e1cb60a042b1812cb differ diff --git a/git/objects/f6/4e71e940b63b63f5d637ed65413e7725c0fbea b/git/objects/f6/4e71e940b63b63f5d637ed65413e7725c0fbea new file mode 100644 index 0000000000000000000000000000000000000000..4dc36826eed845ba178b7795e65ed2e4340af0ee --- /dev/null +++ b/git/objects/f6/4e71e940b63b63f5d637ed65413e7725c0fbea @@ -0,0 +1 @@ +xKj0@)f_3,yB)=@w9X3J U9~tl<˭֭©f["b.?O1)OPˆ[ۇ±HfulQ5%-+~o\eF꽷ގMzUPL43^q]1USs;ԦpOHL \ No newline at end of file diff --git a/git/objects/f7/5cefb0ae88d8606f719a25e8ebdae1bc38d38a b/git/objects/f7/5cefb0ae88d8606f719a25e8ebdae1bc38d38a new file mode 100644 index 0000000000000000000000000000000000000000..e5a09a7f14b421b950605665a9cf4f9fc67acaff Binary files /dev/null and b/git/objects/f7/5cefb0ae88d8606f719a25e8ebdae1bc38d38a differ diff --git a/git/objects/fd/6106c276e40c982cc460c2830fd29c5ce62644 b/git/objects/fd/6106c276e40c982cc460c2830fd29c5ce62644 new file mode 100644 index 0000000000000000000000000000000000000000..c99df6a2c1c21ead7be4cc83ba325d2d32723c68 Binary files /dev/null and b/git/objects/fd/6106c276e40c982cc460c2830fd29c5ce62644 differ diff --git a/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.idx b/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.idx new file mode 100644 index 0000000000000000000000000000000000000000..f1e0ee379242a12905247ece3522d9a2f8f362db Binary files /dev/null and b/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.idx differ diff --git a/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.pack b/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.pack new file mode 100644 index 0000000000000000000000000000000000000000..2b9bd8ae18fd6f402ba3e7f2fdcd49aedb1fc880 --- /dev/null +++ b/git/objects/pack/pack-46797973aedfda2fd9f14f7455706e10f448330a.pack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:869cb8a273073393f9fb7b68d7b913d752e6282bebd94f473a65daabe7e08278 +size 1076391 diff --git a/git/packed-refs b/git/packed-refs new file mode 100644 index 0000000000000000000000000000000000000000..9c106de91c289a53970a282a62c772cd578f0d5c --- /dev/null +++ b/git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +ee167eabe8e02e39385d02d109cec2a5ac5718fd refs/remotes/origin/master diff --git a/git/refs/heads/master b/git/refs/heads/master new file mode 100644 index 0000000000000000000000000000000000000000..8ea57bdf5d7ee7dbcc0ce96cef2ef6d8471838a4 --- /dev/null +++ b/git/refs/heads/master @@ -0,0 +1 @@ +a9eacb1eff904552d3012babfa28b57e1d3e295c diff --git a/git/refs/remotes/origin/HEAD b/git/refs/remotes/origin/HEAD new file mode 100644 index 0000000000000000000000000000000000000000..6efe28fff834a94fbc20cac51fe9cd65ecc78d43 --- /dev/null +++ b/git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/git/refs/remotes/origin/master b/git/refs/remotes/origin/master new file mode 100644 index 0000000000000000000000000000000000000000..8ea57bdf5d7ee7dbcc0ce96cef2ef6d8471838a4 --- /dev/null +++ b/git/refs/remotes/origin/master @@ -0,0 +1 @@ +a9eacb1eff904552d3012babfa28b57e1d3e295c diff --git a/javascript/tagger.js b/javascript/tagger.js new file mode 100644 index 0000000000000000000000000000000000000000..0c92e98ace3ef1ebbd08c2594746b94f6373b510 --- /dev/null +++ b/javascript/tagger.js @@ -0,0 +1,108 @@ +/** + * wait until element is loaded and returns + * @param {string} selector + * @param {number} timeout + * @param {Element} $rootElement + * @returns {Promise} + */ +function waitQuerySelector(selector, timeout = 5000, $rootElement = gradioApp()) { + return new Promise((resolve, reject) => { + const element = $rootElement.querySelector(selector) + if (document.querySelector(element)) { + return resolve(element) + } + + let timeoutId + + const observer = new MutationObserver(() => { + const element = $rootElement.querySelector(selector) + if (!element) { + return + } + + if (timeoutId) { + clearInterval(timeoutId) + } + + observer.disconnect() + resolve(element) + }) + + timeoutId = setTimeout(() => { + observer.disconnect() + reject(new Error(`timeout, cannot find element by '${selector}'`)) + }, timeout) + + observer.observe($rootElement, { + childList: true, + subtree: true + }) + }) +} + +document.addEventListener('DOMContentLoaded', () => { + Promise.all([ + // option texts + waitQuerySelector('#additioanl-tags'), + waitQuerySelector('#exclude-tags'), + + // tag-confident labels + waitQuerySelector('#rating-confidents'), + waitQuerySelector('#tag-confidents') + ]).then(elements => { + + const $additionalTags = elements[0].querySelector('textarea') + const $excludeTags = elements[1].querySelector('textarea') + const $ratingConfidents = elements[2] + const $tagConfidents = elements[3] + + let $selectedTextarea = $additionalTags + + /** + * @this {HTMLElement} + * @param {MouseEvent} e + * @listens document#click + */ + function onClickTextarea(e) { + $selectedTextarea = this + } + + $additionalTags.addEventListener('click', onClickTextarea) + $excludeTags.addEventListener('click', onClickTextarea) + + /** + * @this {HTMLElement} + * @param {MouseEvent} e + * @listens document#click + */ + function onClickLabels(e) { + // find clicked label item's wrapper element + const $tag = e.target.closest('.output-label > div:not(:first-child)') + if (!$tag) { + return + } + + /** @type {string} */ + const tag = $tag.querySelector('.leading-snug').textContent + + // ignore if tag is already exist in textbox + const escapedTag = tag.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + const pattern = new RegExp(`(^|,)\\s{0,}${escapedTag}\\s{0,}($|,)`) + if (pattern.test($selectedTextarea.value)) { + return + } + + if ($selectedTextarea.value !== '') { + $selectedTextarea.value += ', ' + } + + $selectedTextarea.value += tag + } + + $ratingConfidents.addEventListener('click', onClickLabels) + $tagConfidents.addEventListener('click', onClickLabels) + + }).catch(err => { + console.error(err) + }) +}) \ No newline at end of file diff --git a/preload.py b/preload.py new file mode 100644 index 0000000000000000000000000000000000000000..2e132bf42ea5585cdaf1c1413d6227f786a969c0 --- /dev/null +++ b/preload.py @@ -0,0 +1,27 @@ +from pathlib import Path +from argparse import ArgumentParser + +from modules.shared import models_path + +default_ddp_path = Path(models_path, 'deepdanbooru') +default_onnx_path = Path(models_path, 'TaggerOnnx') + + +def preload(parser: ArgumentParser): + # default deepdanbooru use different paths: + # models/deepbooru and models/torch_deepdanbooru + # https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/c81d440d876dfd2ab3560410f37442ef56fc6632 + + parser.add_argument( + '--deepdanbooru-projects-path', + type=str, + help='Path to directory with DeepDanbooru project(s).', + default=default_ddp_path + ) + parser.add_argument( + '--onnxtagger-path', + type=str, + help='Path to directory with DeepDanbooru project(s).', + default=default_onnx_path + ) + diff --git a/scripts/tagger.py b/scripts/tagger.py new file mode 100644 index 0000000000000000000000000000000000000000..bab3a949c7dcfb93d33f66a4d570fd0621ff6c97 --- /dev/null +++ b/scripts/tagger.py @@ -0,0 +1,18 @@ +from PIL import Image, ImageFile + +from modules import script_callbacks +from tagger.api import on_app_started +from tagger.ui import on_ui_tabs + + +# if you do not initialize the Image object +# Image.registered_extensions() returns only PNG +Image.init() + +# PIL spits errors when loading a truncated image by default +# https://pillow.readthedocs.io/en/stable/reference/ImageFile.html#PIL.ImageFile.LOAD_TRUNCATED_IMAGES +ImageFile.LOAD_TRUNCATED_IMAGES = True + + +script_callbacks.on_app_started(on_app_started) +script_callbacks.on_ui_tabs(on_ui_tabs) diff --git a/style.css b/style.css new file mode 100644 index 0000000000000000000000000000000000000000..a43b73754a5621cc81faafb141991615732e1687 --- /dev/null +++ b/style.css @@ -0,0 +1,7 @@ +#rating-confidents .output-label>div:not(:first-child) { + cursor: pointer; +} + +#tag-confidents .output-label>div:not(:first-child) { + cursor: pointer; +} \ No newline at end of file diff --git a/tagger/__pycache__/api.cpython-310.pyc b/tagger/__pycache__/api.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d52d0f078830f186d2bb3c26383d90c85b6ae340 Binary files /dev/null and b/tagger/__pycache__/api.cpython-310.pyc differ diff --git a/tagger/__pycache__/api_models.cpython-310.pyc b/tagger/__pycache__/api_models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c5cd5c21fbe4693ee5a980abf0c6003af424d26c Binary files /dev/null and b/tagger/__pycache__/api_models.cpython-310.pyc differ diff --git a/tagger/__pycache__/dbimutils.cpython-310.pyc b/tagger/__pycache__/dbimutils.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..218d716408327848c6e933e17304749bfc6b3cb1 Binary files /dev/null and b/tagger/__pycache__/dbimutils.cpython-310.pyc differ diff --git a/tagger/__pycache__/format.cpython-310.pyc b/tagger/__pycache__/format.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5d4d07b01b9d895b0ab2c10af456d14b3558592c Binary files /dev/null and b/tagger/__pycache__/format.cpython-310.pyc differ diff --git a/tagger/__pycache__/interrogator.cpython-310.pyc b/tagger/__pycache__/interrogator.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9106f594bb9079072618719e573df0ff1b9a44d5 Binary files /dev/null and b/tagger/__pycache__/interrogator.cpython-310.pyc differ diff --git a/tagger/__pycache__/preset.cpython-310.pyc b/tagger/__pycache__/preset.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..699ca0746cac9dac4823e1a1c7e42a88c815dab5 Binary files /dev/null and b/tagger/__pycache__/preset.cpython-310.pyc differ diff --git a/tagger/__pycache__/ui.cpython-310.pyc b/tagger/__pycache__/ui.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..531ccf82ca446c112ea0c0bf3b071d61af71fb63 Binary files /dev/null and b/tagger/__pycache__/ui.cpython-310.pyc differ diff --git a/tagger/__pycache__/utils.cpython-310.pyc b/tagger/__pycache__/utils.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5949d202dc83fcc0ae2690655cb8e216fda0f4a2 Binary files /dev/null and b/tagger/__pycache__/utils.cpython-310.pyc differ diff --git a/tagger/api.py b/tagger/api.py new file mode 100644 index 0000000000000000000000000000000000000000..c064be27d019886e0416f6382fed9bccaf5f1df4 --- /dev/null +++ b/tagger/api.py @@ -0,0 +1,90 @@ +from typing import Callable +from threading import Lock +from secrets import compare_digest + +from modules import shared +from modules.api.api import decode_base64_to_image +from modules.call_queue import queue_lock +from fastapi import FastAPI, Depends, HTTPException +from fastapi.security import HTTPBasic, HTTPBasicCredentials + +from tagger import utils +from tagger import api_models as models + + +class Api: + def __init__(self, app: FastAPI, queue_lock: Lock, prefix: str = None) -> None: + if shared.cmd_opts.api_auth: + self.credentials = dict() + for auth in shared.cmd_opts.api_auth.split(","): + user, password = auth.split(":") + self.credentials[user] = password + + self.app = app + self.queue_lock = queue_lock + self.prefix = prefix + + self.add_api_route( + 'interrogate', + self.endpoint_interrogate, + methods=['POST'], + response_model=models.TaggerInterrogateResponse + ) + + self.add_api_route( + 'interrogators', + self.endpoint_interrogators, + methods=['GET'], + response_model=models.InterrogatorsResponse + ) + + def auth(self, creds: HTTPBasicCredentials = Depends(HTTPBasic())): + if creds.username in self.credentials: + if compare_digest(creds.password, self.credentials[creds.username]): + return True + + raise HTTPException( + status_code=401, + detail="Incorrect username or password", + headers={ + "WWW-Authenticate": "Basic" + }) + + def add_api_route(self, path: str, endpoint: Callable, **kwargs): + if self.prefix: + path = f'{self.prefix}/{path}' + + if shared.cmd_opts.api_auth: + return self.app.add_api_route(path, endpoint, dependencies=[Depends(self.auth)], **kwargs) + return self.app.add_api_route(path, endpoint, **kwargs) + + def endpoint_interrogate(self, req: models.TaggerInterrogateRequest): + if req.image is None: + raise HTTPException(404, 'Image not found') + + if req.model not in utils.interrogators.keys(): + raise HTTPException(404, 'Model not found') + + image = decode_base64_to_image(req.image) + interrogator = utils.interrogators[req.model] + + with self.queue_lock: + ratings, tags = interrogator.interrogate(image) + + return models.TaggerInterrogateResponse( + caption={ + **ratings, + **interrogator.postprocess_tags( + tags, + req.threshold + ) + }) + + def endpoint_interrogators(self): + return models.InterrogatorsResponse( + models=list(utils.interrogators.keys()) + ) + + +def on_app_started(_, app: FastAPI): + Api(app, queue_lock, '/tagger/v1') diff --git a/tagger/api_models.py b/tagger/api_models.py new file mode 100644 index 0000000000000000000000000000000000000000..3f19b0ed40e3bbebd5a13055f47ac9f5078e5bab --- /dev/null +++ b/tagger/api_models.py @@ -0,0 +1,33 @@ +from typing import List, Dict + +from modules.api import models as sd_models +from pydantic import BaseModel, Field + + +class TaggerInterrogateRequest(sd_models.InterrogateRequest): + model: str = Field( + title='Model', + description='The interrogate model used.' + ) + + threshold: float = Field( + default=0.35, + title='Threshold', + description='', + ge=0, + le=1 + ) + + +class TaggerInterrogateResponse(BaseModel): + caption: Dict[str, float] = Field( + title='Caption', + description='The generated caption for the image.' + ) + + +class InterrogatorsResponse(BaseModel): + models: List[str] = Field( + title='Models', + description='' + ) diff --git a/tagger/dbimutils.py b/tagger/dbimutils.py new file mode 100644 index 0000000000000000000000000000000000000000..e01496710f8905e542dbe7e89c91fd2c8d1bc14a --- /dev/null +++ b/tagger/dbimutils.py @@ -0,0 +1,54 @@ +# DanBooru IMage Utility functions + +import cv2 +import numpy as np +from PIL import Image + + +def smart_imread(img, flag=cv2.IMREAD_UNCHANGED): + if img.endswith(".gif"): + img = Image.open(img) + img = img.convert("RGB") + img = cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR) + else: + img = cv2.imread(img, flag) + return img + + +def smart_24bit(img): + if img.dtype is np.dtype(np.uint16): + img = (img / 257).astype(np.uint8) + + if len(img.shape) == 2: + img = cv2.cvtColor(img, cv2.COLOR_GRAY2BGR) + elif img.shape[2] == 4: + trans_mask = img[:, :, 3] == 0 + img[trans_mask] = [255, 255, 255, 255] + img = cv2.cvtColor(img, cv2.COLOR_BGRA2BGR) + return img + + +def make_square(img, target_size): + old_size = img.shape[:2] + desired_size = max(old_size) + desired_size = max(desired_size, target_size) + + delta_w = desired_size - old_size[1] + delta_h = desired_size - old_size[0] + top, bottom = delta_h // 2, delta_h - (delta_h // 2) + left, right = delta_w // 2, delta_w - (delta_w // 2) + + color = [255, 255, 255] + new_im = cv2.copyMakeBorder( + img, top, bottom, left, right, cv2.BORDER_CONSTANT, value=color + ) + return new_im + + +def smart_resize(img, size): + # Assumes the image has already gone through make_square + if img.shape[0] > size: + img = cv2.resize(img, (size, size), interpolation=cv2.INTER_AREA) + elif img.shape[0] < size: + img = cv2.resize(img, (size, size), interpolation=cv2.INTER_CUBIC) + return img diff --git a/tagger/format.py b/tagger/format.py new file mode 100644 index 0000000000000000000000000000000000000000..5f596f3f8191ff108435dc87347ee7d720749593 --- /dev/null +++ b/tagger/format.py @@ -0,0 +1,46 @@ +import re +import hashlib + +from typing import Dict, Callable, NamedTuple +from pathlib import Path + + +class Info(NamedTuple): + path: Path + output_ext: str + + +def hash(i: Info, algo='sha1') -> str: + try: + hash = hashlib.new(algo) + except ImportError: + raise ValueError(f"'{algo}' is invalid hash algorithm") + + # TODO: is okay to hash large image? + with open(i.path, 'rb') as file: + hash.update(file.read()) + + return hash.hexdigest() + + +pattern = re.compile(r'\[([\w:]+)\]') + +# all function must returns string or raise TypeError or ValueError +# other errors will cause the extension error +available_formats: Dict[str, Callable] = { + 'name': lambda i: i.path.stem, + 'extension': lambda i: i.path.suffix[1:], + 'hash': hash, + + 'output_extension': lambda i: i.output_ext +} + + +def format(match: re.Match, info: Info) -> str: + matches = match[1].split(':') + name, args = matches[0], matches[1:] + + if name not in available_formats: + return match[0] + + return available_formats[name](info, *args) diff --git a/tagger/interrogator.py b/tagger/interrogator.py new file mode 100644 index 0000000000000000000000000000000000000000..9b1972c9dd927b54cef62dd8874c3cd44627072e --- /dev/null +++ b/tagger/interrogator.py @@ -0,0 +1,320 @@ +import os +import gc +import pandas as pd +import numpy as np + +from typing import Tuple, List, Dict +from io import BytesIO +from PIL import Image + +from pathlib import Path +from huggingface_hub import hf_hub_download + +from modules import shared +from modules.deepbooru import re_special as tag_escape_pattern + +# i'm not sure if it's okay to add this file to the repository +from . import dbimutils + +# select a device to process +use_cpu = ('all' in shared.cmd_opts.use_cpu) or ( + 'interrogate' in shared.cmd_opts.use_cpu) + +if use_cpu: + tf_device_name = '/cpu:0' +else: + tf_device_name = '/gpu:0' + + if shared.cmd_opts.device_id is not None: + try: + tf_device_name = f'/gpu:{int(shared.cmd_opts.device_id)}' + except ValueError: + print('--device-id is not a integer') + + +class Interrogator: + @staticmethod + def postprocess_tags( + tags: Dict[str, float], + + threshold=0.35, + additional_tags: List[str] = [], + exclude_tags: List[str] = [], + sort_by_alphabetical_order=False, + add_confident_as_weight=False, + replace_underscore=False, + replace_underscore_excludes: List[str] = [], + escape_tag=False + ) -> Dict[str, float]: + + tags = { + **{t: 1.0 for t in additional_tags}, + **tags + } + + # those lines are totally not "pythonic" but looks better to me + tags = { + t: c + + # sort by tag name or confident + for t, c in sorted( + tags.items(), + key=lambda i: i[0 if sort_by_alphabetical_order else 1], + reverse=not sort_by_alphabetical_order + ) + + # filter tags + if ( + c >= threshold + and t not in exclude_tags + ) + } + + new_tags = [] + for tag in list(tags): + new_tag = tag + + if replace_underscore and tag not in replace_underscore_excludes: + new_tag = new_tag.replace('_', ' ') + + if escape_tag: + new_tag = tag_escape_pattern.sub(r'\\\1', new_tag) + + if add_confident_as_weight: + new_tag = f'({new_tag}:{tags[tag]})' + + new_tags.append((new_tag, tags[tag])) + tags = dict(new_tags) + + return tags + + def __init__(self, name: str) -> None: + self.name = name + + def load(self): + raise NotImplementedError() + + def unload(self) -> bool: + unloaded = False + + if hasattr(self, 'model') and self.model is not None: + del self.model + unloaded = True + print(f'Unloaded {self.name}') + + if hasattr(self, 'tags'): + del self.tags + + return unloaded + + def interrogate( + self, + image: Image + ) -> Tuple[ + Dict[str, float], # rating confidents + Dict[str, float] # tag confidents + ]: + raise NotImplementedError() + + +class DeepDanbooruInterrogator(Interrogator): + def __init__(self, name: str, project_path: os.PathLike) -> None: + super().__init__(name) + self.project_path = project_path + + def load(self) -> None: + print(f'Loading {self.name} from {str(self.project_path)}') + + # deepdanbooru package is not include in web-sd anymore + # https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/c81d440d876dfd2ab3560410f37442ef56fc663 + from launch import is_installed, run_pip + if not is_installed('deepdanbooru'): + package = os.environ.get( + 'DEEPDANBOORU_PACKAGE', + 'git+https://github.com/KichangKim/DeepDanbooru.git@d91a2963bf87c6a770d74894667e9ffa9f6de7ff' + ) + + run_pip( + f'install {package} tensorflow tensorflow-io', 'deepdanbooru') + + import tensorflow as tf + + # tensorflow maps nearly all vram by default, so we limit this + # https://www.tensorflow.org/guide/gpu#limiting_gpu_memory_growth + # TODO: only run on the first run + for device in tf.config.experimental.list_physical_devices('GPU'): + tf.config.experimental.set_memory_growth(device, True) + + with tf.device(tf_device_name): + import deepdanbooru.project as ddp + + self.model = ddp.load_model_from_project( + project_path=self.project_path, + compile_model=False + ) + + print(f'Loaded {self.name} model from {str(self.project_path)}') + + self.tags = ddp.load_tags_from_project( + project_path=self.project_path + ) + + def unload(self) -> bool: + # unloaded = super().unload() + + # if unloaded: + # # tensorflow suck + # # https://github.com/keras-team/keras/issues/2102 + # import tensorflow as tf + # tf.keras.backend.clear_session() + # gc.collect() + + # return unloaded + + # There is a bug in Keras where it is not possible to release a model that has been loaded into memory. + # Downgrading to keras==2.1.6 may solve the issue, but it may cause compatibility issues with other packages. + # Using subprocess to create a new process may also solve the problem, but it can be too complex (like Automatic1111 did). + # It seems that for now, the best option is to keep the model in memory, as most users use the Waifu Diffusion model with onnx. + + return False + + def interrogate( + self, + image: Image + ) -> Tuple[ + Dict[str, float], # rating confidents + Dict[str, float] # tag confidents + ]: + # init model + if not hasattr(self, 'model') or self.model is None: + self.load() + + import deepdanbooru.data as ddd + + # convert an image to fit the model + image_bufs = BytesIO() + image.save(image_bufs, format='PNG') + image = ddd.load_image_for_evaluate( + image_bufs, + self.model.input_shape[2], + self.model.input_shape[1] + ) + + image = image.reshape((1, *image.shape[0:3])) + + # evaluate model + result = self.model.predict(image) + + confidents = result[0].tolist() + ratings = {} + tags = {} + + for i, tag in enumerate(self.tags): + tags[tag] = confidents[i] + + return ratings, tags + + +class WaifuDiffusionInterrogator(Interrogator): + def __init__( + self, + name: str, + model_path='model.onnx', + tags_path='selected_tags.csv', + **kwargs + ) -> None: + super().__init__(name) + self.model_path = model_path + self.tags_path = tags_path + self.kwargs = kwargs + + def download(self) -> Tuple[os.PathLike, os.PathLike]: + #if model_path exists, skip download + print(self.model_path, self.tags_path) + if os.path.exists(self.model_path) and os.path.exists(self.tags_path): + return self.model_path, self.tags_path + print(f"Loading {self.name} model file from {self.kwargs['repo_id']}") + + model_path = Path(hf_hub_download( + **self.kwargs, filename=self.model_path)) + tags_path = Path(hf_hub_download( + **self.kwargs, filename=self.tags_path)) + return model_path, tags_path + + def load(self) -> None: + model_path, tags_path = self.download() + + # only one of these packages should be installed at a time in any one environment + # https://onnxruntime.ai/docs/get-started/with-python.html#install-onnx-runtime + # TODO: remove old package when the environment changes? + from launch import is_installed, run_pip + if not is_installed('onnxruntime'): + package = os.environ.get( + 'ONNXRUNTIME_PACKAGE', + 'onnxruntime-gpu' + ) + + run_pip(f'install {package}', 'onnxruntime') + + from onnxruntime import InferenceSession + + # https://onnxruntime.ai/docs/execution-providers/ + # https://github.com/toriato/stable-diffusion-webui-wd14-tagger/commit/e4ec460122cf674bbf984df30cdb10b4370c1224#r92654958 + providers = ['CUDAExecutionProvider', 'CPUExecutionProvider'] + if use_cpu: + providers.pop(0) + + self.model = InferenceSession(str(model_path), providers=providers) + + print(f'Loaded {self.name} model from {model_path}') + + self.tags = pd.read_csv(tags_path) + + def interrogate( + self, + image: Image + ) -> Tuple[ + Dict[str, float], # rating confidents + Dict[str, float] # tag confidents + ]: + # init model + if not hasattr(self, 'model') or self.model is None: + self.load() + + # code for converting the image and running the model is taken from the link below + # thanks, SmilingWolf! + # https://huggingface.co/spaces/SmilingWolf/wd-v1-4-tags/blob/main/app.py + + # convert an image to fit the model + _, height, _, _ = self.model.get_inputs()[0].shape + + # alpha to white + image = image.convert('RGBA') + new_image = Image.new('RGBA', image.size, 'WHITE') + new_image.paste(image, mask=image) + image = new_image.convert('RGB') + image = np.asarray(image) + + # PIL RGB to OpenCV BGR + image = image[:, :, ::-1] + + image = dbimutils.make_square(image, height) + image = dbimutils.smart_resize(image, height) + image = image.astype(np.float32) + image = np.expand_dims(image, 0) + + # evaluate model + input_name = self.model.get_inputs()[0].name + label_name = self.model.get_outputs()[0].name + confidents = self.model.run([label_name], {input_name: image})[0] + + tags = self.tags[:][['name']] + tags['confidents'] = confidents[0] + + # first 4 items are for rating (general, sensitive, questionable, explicit) + ratings = dict(tags[:4].values) + + # rest are regular tags + tags = dict(tags[4:].values) + + return ratings, tags diff --git a/tagger/preset.py b/tagger/preset.py new file mode 100644 index 0000000000000000000000000000000000000000..0cf24a6132b42b1d47e93ca79ef9bc0ac7691bc5 --- /dev/null +++ b/tagger/preset.py @@ -0,0 +1,108 @@ +import os +import json + +from typing import Tuple, List, Dict +from pathlib import Path +from modules.images import sanitize_filename_part + +PresetDict = Dict[str, Dict[str, any]] + + +class Preset: + base_dir: Path + default_filename: str + default_values: PresetDict + components: List[object] + + def __init__( + self, + base_dir: os.PathLike, + default_filename='default.json' + ) -> None: + self.base_dir = Path(base_dir) + self.default_filename = default_filename + self.default_values = self.load(default_filename)[1] + self.components = [] + + def component(self, component_class: object, **kwargs) -> object: + # find all the top components from the Gradio context and create a path + from gradio.context import Context + parent = Context.block + paths = [kwargs['label']] + + while parent is not None: + if hasattr(parent, 'label'): + paths.insert(0, parent.label) + + parent = parent.parent + + path = '/'.join(paths) + + component = component_class(**{ + **kwargs, + **self.default_values.get(path, {}) + }) + + setattr(component, 'path', path) + + self.components.append(component) + return component + + def load(self, filename: str) -> Tuple[str, PresetDict]: + if not filename.endswith('.json'): + filename += '.json' + + path = self.base_dir.joinpath(sanitize_filename_part(filename)) + configs = {} + + if path.is_file(): + configs = json.loads(path.read_text()) + + return path, configs + + def save(self, filename: str, *values) -> Tuple: + path, configs = self.load(filename) + + for index, component in enumerate(self.components): + config = configs.get(component.path, {}) + config['value'] = values[index] + + for attr in ['visible', 'min', 'max', 'step']: + if hasattr(component, attr): + config[attr] = config.get(attr, getattr(component, attr)) + + configs[component.path] = config + + self.base_dir.mkdir(0o777, True, True) + path.write_text( + json.dumps(configs, indent=4) + ) + + return 'successfully saved the preset' + + def apply(self, filename: str) -> Tuple: + values = self.load(filename)[1] + outputs = [] + + for component in self.components: + config = values.get(component.path, {}) + + if 'value' in config and hasattr(component, 'choices'): + if config['value'] not in component.choices: + config['value'] = None + + outputs.append(component.update(**config)) + + return (*outputs, 'successfully loaded the preset') + + def list(self) -> List[str]: + presets = [ + p.name + for p in self.base_dir.glob('*.json') + if p.is_file() + ] + + if len(presets) < 1: + presets.append(self.default_filename) + + return presets diff --git a/tagger/ui.py b/tagger/ui.py new file mode 100644 index 0000000000000000000000000000000000000000..2852056ca941163a5a7cc7e4d565d41684e5b897 --- /dev/null +++ b/tagger/ui.py @@ -0,0 +1,464 @@ +import os +import json +import gradio as gr + +from pathlib import Path +from glob import glob +from PIL import Image, UnidentifiedImageError + +from webui import wrap_gradio_gpu_call +from modules import ui +from modules import generation_parameters_copypaste as parameters_copypaste + +from tagger import format, utils +from tagger.utils import split_str +from tagger.interrogator import Interrogator + + +def unload_interrogators(): + unloaded_models = 0 + + for i in utils.interrogators.values(): + if i.unload(): + unloaded_models = unloaded_models + 1 + + return [f'Successfully unload {unloaded_models} model(s)'] + + +def on_interrogate( + image: Image, + batch_input_glob: str, + batch_input_recursive: bool, + batch_output_dir: str, + batch_output_filename_format: str, + batch_output_action_on_conflict: str, + batch_output_save_json: bool, + + interrogator: str, + threshold: float, + additional_tags: str, + exclude_tags: str, + sort_by_alphabetical_order: bool, + add_confident_as_weight: bool, + replace_underscore: bool, + replace_underscore_excludes: str, + escape_tag: bool, + + unload_model_after_running: bool +): + if interrogator not in utils.interrogators: + return ['', None, None, f"'{interrogator}' is not a valid interrogator"] + + interrogator: Interrogator = utils.interrogators[interrogator] + + postprocess_opts = ( + threshold, + split_str(additional_tags), + split_str(exclude_tags), + sort_by_alphabetical_order, + add_confident_as_weight, + replace_underscore, + split_str(replace_underscore_excludes), + escape_tag + ) + + # single process + if image is not None: + ratings, tags = interrogator.interrogate(image) + processed_tags = Interrogator.postprocess_tags( + tags, + *postprocess_opts + ) + + if unload_model_after_running: + interrogator.unload() + + return [ + ', '.join(processed_tags), + ratings, + tags, + '' + ] + + # batch process + batch_input_glob = batch_input_glob.strip() + batch_output_dir = batch_output_dir.strip() + batch_output_filename_format = batch_output_filename_format.strip() + + if batch_input_glob != '': + # if there is no glob pattern, insert it automatically + if not batch_input_glob.endswith('*'): + if not batch_input_glob.endswith('/'): + batch_input_glob += '/' + batch_input_glob += '*' + + # get root directory of input glob pattern + base_dir = batch_input_glob.replace('?', '*') + base_dir = base_dir.split('/*').pop(0) + + # check the input directory path + if not os.path.isdir(base_dir): + return ['', None, None, 'input path is not a directory'] + + # this line is moved here because some reason + # PIL.Image.registered_extensions() returns only PNG if you call too early + supported_extensions = [ + e + for e, f in Image.registered_extensions().items() + if f in Image.OPEN + ] + + paths = [ + Path(p) + for p in glob(batch_input_glob, recursive=batch_input_recursive) + if '.' + p.split('.').pop().lower() in supported_extensions + ] + + print(f'found {len(paths)} image(s)') + + for path in paths: + try: + image = Image.open(path) + except UnidentifiedImageError: + # just in case, user has mysterious file... + print(f'${path} is not supported image type') + continue + + # guess the output path + base_dir_last = Path(base_dir).parts[-1] + base_dir_last_idx = path.parts.index(base_dir_last) + output_dir = Path( + batch_output_dir) if batch_output_dir else Path(base_dir) + output_dir = output_dir.joinpath( + *path.parts[base_dir_last_idx + 1:]).parent + + output_dir.mkdir(0o777, True, True) + + # format output filename + format_info = format.Info(path, 'txt') + + try: + formatted_output_filename = format.pattern.sub( + lambda m: format.format(m, format_info), + batch_output_filename_format + ) + except (TypeError, ValueError) as error: + return ['', None, None, str(error)] + + output_path = output_dir.joinpath( + formatted_output_filename + ) + + output = [] + + if output_path.is_file(): + output.append(output_path.read_text()) + + if batch_output_action_on_conflict == 'ignore': + print(f'skipping {path}') + continue + + ratings, tags = interrogator.interrogate(image) + processed_tags = Interrogator.postprocess_tags( + tags, + *postprocess_opts + ) + + # TODO: switch for less print + print( + f'found {len(processed_tags)} tags out of {len(tags)} from {path}' + ) + + plain_tags = ', '.join(processed_tags) + + if batch_output_action_on_conflict == 'copy': + output = [plain_tags] + elif batch_output_action_on_conflict == 'prepend': + output.insert(0, plain_tags) + else: + output.append(plain_tags) + + output_path.write_text(' '.join(output)) + + if batch_output_save_json: + output_path.with_suffix('.json').write_text( + json.dumps([ratings, tags]) + ) + + print('all done :)') + + if unload_model_after_running: + interrogator.unload() + + return ['', None, None, ''] + + +def on_ui_tabs(): + with gr.Blocks(analytics_enabled=False) as tagger_interface: + with gr.Row().style(equal_height=False): + with gr.Column(variant='panel'): + + # input components + with gr.Tabs(): + with gr.TabItem(label='Single process'): + image = gr.Image( + label='Source', + source='upload', + interactive=True, + type="pil" + ) + + with gr.TabItem(label='Batch from directory'): + batch_input_glob = utils.preset.component( + gr.Textbox, + label='Input directory', + placeholder='/path/to/images or /path/to/images/**/*' + ) + batch_input_recursive = utils.preset.component( + gr.Checkbox, + label='Use recursive with glob pattern' + ) + + batch_output_dir = utils.preset.component( + gr.Textbox, + label='Output directory', + placeholder='Leave blank to save images to the same path.' + ) + + batch_output_filename_format = utils.preset.component( + gr.Textbox, + label='Output filename format', + placeholder='Leave blank to use same filename as original.', + value='[name].[output_extension]' + ) + + import hashlib + with gr.Accordion( + label='Output filename formats', + open=False + ): + gr.Markdown( + value=f''' + ### Related to original file + - `[name]`: Original filename without extension + - `[extension]`: Original extension + - `[hash:]`: Original extension + Available algorithms: `{', '.join(hashlib.algorithms_available)}` + + ### Related to output file + - `[output_extension]`: Output extension (has no dot) + + ## Examples + ### Original filename without extension + `[name].[output_extension]` + + ### Original file's hash (good for deleting duplication) + `[hash:sha1].[output_extension]` + ''' + ) + + batch_output_action_on_conflict = utils.preset.component( + gr.Dropdown, + label='Action on exiting caption', + value='ignore', + choices=[ + 'ignore', + 'copy', + 'append', + 'prepend' + ] + ) + + batch_output_save_json = utils.preset.component( + gr.Checkbox, + label='Save with JSON' + ) + + submit = gr.Button( + value='Interrogate', + variant='primary' + ) + + info = gr.HTML() + + # preset selector + with gr.Row(variant='compact'): + available_presets = utils.preset.list() + selected_preset = gr.Dropdown( + label='Preset', + choices=available_presets, + value=available_presets[0] + ) + + save_preset_button = gr.Button( + value=ui.save_style_symbol + ) + + ui.create_refresh_button( + selected_preset, + lambda: None, + lambda: {'choices': utils.preset.list()}, + 'refresh_preset' + ) + + # option components + + # interrogator selector + with gr.Column(): + with gr.Row(variant='compact'): + interrogator_names = utils.refresh_interrogators() + interrogator = utils.preset.component( + gr.Dropdown, + label='Interrogator', + choices=interrogator_names, + value=( + None + if len(interrogator_names) < 1 else + interrogator_names[-1] + ) + ) + + ui.create_refresh_button( + interrogator, + lambda: None, + lambda: {'choices': utils.refresh_interrogators()}, + 'refresh_interrogator' + ) + + unload_all_models = gr.Button( + value='Unload all interrogate models' + ) + + threshold = utils.preset.component( + gr.Slider, + label='Threshold', + minimum=0, + maximum=1, + value=0.35 + ) + + additional_tags = utils.preset.component( + gr.Textbox, + label='Additional tags (split by comma)', + elem_id='additioanl-tags' + ) + + exclude_tags = utils.preset.component( + gr.Textbox, + label='Exclude tags (split by comma)', + elem_id='exclude-tags' + ) + + sort_by_alphabetical_order = utils.preset.component( + gr.Checkbox, + label='Sort by alphabetical order', + ) + add_confident_as_weight = utils.preset.component( + gr.Checkbox, + label='Include confident of tags matches in results' + ) + replace_underscore = utils.preset.component( + gr.Checkbox, + label='Use spaces instead of underscore', + value=True + ) + replace_underscore_excludes = utils.preset.component( + gr.Textbox, + label='Excudes (split by comma)', + # kaomoji from WD 1.4 tagger csv. thanks, Meow-San#5400! + value='0_0, (o)_(o), +_+, +_-, ._., _, <|>_<|>, =_=, >_<, 3_3, 6_9, >_o, @_@, ^_^, o_o, u_u, x_x, |_|, ||_||' + ) + escape_tag = utils.preset.component( + gr.Checkbox, + label='Escape brackets', + ) + + unload_model_after_running = utils.preset.component( + gr.Checkbox, + label='Unload model after running', + ) + + # output components + with gr.Column(variant='panel'): + tags = gr.Textbox( + label='Tags', + placeholder='Found tags', + interactive=False + ) + + with gr.Row(): + parameters_copypaste.bind_buttons( + parameters_copypaste.create_buttons( + ["txt2img", "img2img"], + ), + None, + tags + ) + + rating_confidents = gr.Label( + label='Rating confidents', + elem_id='rating-confidents' + ) + tag_confidents = gr.Label( + label='Tag confidents', + elem_id='tag-confidents' + ) + + # register events + selected_preset.change( + fn=utils.preset.apply, + inputs=[selected_preset], + outputs=[*utils.preset.components, info] + ) + + save_preset_button.click( + fn=utils.preset.save, + inputs=[selected_preset, *utils.preset.components], # values only + outputs=[info] + ) + + unload_all_models.click( + fn=unload_interrogators, + outputs=[info] + ) + + for func in [image.change, submit.click]: + func( + fn=wrap_gradio_gpu_call(on_interrogate), + inputs=[ + # single process + image, + + # batch process + batch_input_glob, + batch_input_recursive, + batch_output_dir, + batch_output_filename_format, + batch_output_action_on_conflict, + batch_output_save_json, + + # options + interrogator, + threshold, + additional_tags, + exclude_tags, + sort_by_alphabetical_order, + add_confident_as_weight, + replace_underscore, + replace_underscore_excludes, + escape_tag, + + unload_model_after_running + ], + outputs=[ + tags, + rating_confidents, + tag_confidents, + + # contains execution time, memory usage and other stuffs... + # generated from modules.ui.wrap_gradio_call + info + ] + ) + + return [(tagger_interface, "Tagger", "tagger")] diff --git a/tagger/utils.py b/tagger/utils.py new file mode 100644 index 0000000000000000000000000000000000000000..1e9875b24ab8905065f220fd0ee50b882090cfd4 --- /dev/null +++ b/tagger/utils.py @@ -0,0 +1,103 @@ +import os + +from typing import List, Dict +from pathlib import Path + +from modules import shared, scripts +from preload import default_ddp_path, default_onnx_path +from tagger.preset import Preset +from tagger.interrogator import Interrogator, DeepDanbooruInterrogator, WaifuDiffusionInterrogator + +preset = Preset(Path(scripts.basedir(), 'presets')) + +interrogators: Dict[str, Interrogator] = {} + + +def refresh_interrogators() -> List[str]: + global interrogators + interrogators = { + 'wd14-vit-v2': WaifuDiffusionInterrogator( + 'wd14-vit-v2', + repo_id='SmilingWolf/wd-v1-4-vit-tagger-v2', + revision='v2.0' + ), + 'wd14-convnext-v2': WaifuDiffusionInterrogator( + 'wd14-convnext-v2', + repo_id='SmilingWolf/wd-v1-4-convnext-tagger-v2', + revision='v2.0' + ), + 'wd14-swinv2-v2': WaifuDiffusionInterrogator( + 'wd14-swinv2-v2', + repo_id='SmilingWolf/wd-v1-4-swinv2-tagger-v2', + revision='v2.0' + ), + 'wd14-vit-v2-git': WaifuDiffusionInterrogator( + 'wd14-vit-v2-git', + repo_id='SmilingWolf/wd-v1-4-vit-tagger-v2' + ), + 'wd14-convnext-v2-git': WaifuDiffusionInterrogator( + 'wd14-convnext-v2-git', + repo_id='SmilingWolf/wd-v1-4-convnext-tagger-v2' + ), + 'wd14-swinv2-v2-git': WaifuDiffusionInterrogator( + 'wd14-swinv2-v2-git', + repo_id='SmilingWolf/wd-v1-4-swinv2-tagger-v2' + ), + 'wd14-vit': WaifuDiffusionInterrogator( + 'wd14-vit', + repo_id='SmilingWolf/wd-v1-4-vit-tagger'), + 'wd14-convnext': WaifuDiffusionInterrogator( + 'wd14-convnext', + repo_id='SmilingWolf/wd-v1-4-convnext-tagger' + ), + #'Z3D-E621-convnext': WaifuDiffusionInterrogator( + # 'Z3D-E621-convnext', + # model_path=r'SmilingWolf/wd-v1-4-convnext-tagger', + # tags_path=r'' + #), + } + + # load deepdanbooru project + os.makedirs( + getattr(shared.cmd_opts, 'deepdanbooru_projects_path', default_ddp_path), + exist_ok=True + ) + os.makedirs( + getattr(shared.cmd_opts, 'onnxtagger_path', default_onnx_path), + exist_ok=True + ) + + for path in os.scandir(shared.cmd_opts.deepdanbooru_projects_path): + if not path.is_dir(): + continue + + if not Path(path, 'project.json').is_file(): + continue + + interrogators[path.name] = DeepDanbooruInterrogator(path.name, path) + #scan for onnx models as well + for path in os.scandir(shared.cmd_opts.onnxtagger_path): + if not path.is_dir(): + continue + + #if no file with the extension .onnx is found, skip. If there is more than one file with that name, warn. Else put it in model_path + onnx_files = [x for x in os.scandir(path) if x.name.endswith('.onnx')] + if len(onnx_files) == 0: + print(f"Warning: {path} has no model, skipping") + continue + elif len(onnx_files) > 1: + print(f"Warning: {path} has multiple models, skipping") + continue + model_path = Path(path, onnx_files[0].name) + + if not Path(path, 'tags-selected.csv').is_file(): + print(f"Warning: {path} has a model but no tags-selected.csv file, skipping") + continue + + interrogators[path.name] = WaifuDiffusionInterrogator(path.name,model_path=model_path, tags_path=Path(path, 'tags-selected.csv')) + + return sorted(interrogators.keys()) + + +def split_str(s: str, separator=',') -> List[str]: + return [x.strip() for x in s.split(separator) if x]