AI/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2024-10-01 01:26:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
oobabooga 2023-09-21 17:45:11 -07:00
parent df39f455ad
commit 193fe18c8c
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
cache cache
characters characters
training/datasets training/datasets
@ -34,6 +33,4 @@ models/config-user.yaml
.DS_Store .DS_Store
Thumbs.db Thumbs.db
=======
installer_files/ installer_files/
>>>>>>> second-repo/main

18
README.md
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Text generation web UI # Text generation web UI
A Gradio web UI for Large Language Models. A Gradio web UI for Large Language Models.
@ -391,20 +390,3 @@ If you would like to contribute to the project, check out the [Contributing guid
## Acknowledgment ## Acknowledgment
In August 2023, [Andreessen Horowitz](https://a16z.com/) (a16z) provided a generous grant to encourage and support my independent work on this project. I am **extremely** grateful for their trust and recognition, which will allow me to dedicate more time towards realizing the full potential of text-generation-webui. In August 2023, [Andreessen Horowitz](https://a16z.com/) (a16z) provided a generous grant to encourage and support my independent work on this project. I am **extremely** grateful for their trust and recognition, which will allow me to dedicate more time towards realizing the full potential of text-generation-webui.
=======
# One-click installers
These are automated installers for [oobabooga/text-generation-webui](https://github.com/oobabooga/text-generation-webui).
The idea is to allow people to use the program without having to type commands in the terminal, thus making it more accessible.
## How it works
The `start` scripts download miniconda, create a conda environment inside the current folder, and then install the webui using that environment.
After the initial installation, the `update` scripts are then used to automatically pull the latest text-generation-webui code and upgrade its requirements.
## Limitations
* The start/update scripts themselves are not automatically updated. To update them, you have to re-download the zips listed on the [main README](https://github.com/oobabooga/text-generation-webui#one-click-installers) and overwrite your existing files.
>>>>>>> second-repo/main

23
webui.py
View File

@ -112,23 +112,12 @@ def install_dependencies():
else: else:
run_cmd("conda install -y -k ninja git && python -m pip install torch torchvision torchaudio", assert_success=True, environment=True) run_cmd("conda install -y -k ninja git && python -m pip install torch torchvision torchaudio", assert_success=True, environment=True)
<<<<<<< HEAD
=======
# Clone webui to our computer
run_cmd("git clone https://github.com/oobabooga/text-generation-webui.git", assert_success=True, environment=True)
>>>>>>> second-repo/main
# Install the webui dependencies # Install the webui dependencies
update_dependencies(initial_installation=True) update_dependencies(initial_installation=True)
def update_dependencies(initial_installation=False): def update_dependencies(initial_installation=False):
<<<<<<< HEAD
# run_cmd("git pull", assert_success=True, environment=True) # TODO uncomment before merging (is there a better way?) # run_cmd("git pull", assert_success=True, environment=True) # TODO uncomment before merging (is there a better way?)
=======
os.chdir("text-generation-webui")
run_cmd("git pull", assert_success=True, environment=True)
>>>>>>> second-repo/main
# Install the extensions dependencies (only on the first install) # Install the extensions dependencies (only on the first install)
if initial_installation: if initial_installation:
@ -222,18 +211,10 @@ def update_dependencies(initial_installation=False):
def download_model(): def download_model():
<<<<<<< HEAD
=======
os.chdir("text-generation-webui")
>>>>>>> second-repo/main
run_cmd("python download-model.py", environment=True) run_cmd("python download-model.py", environment=True)
def launch_webui(): def launch_webui():
<<<<<<< HEAD
=======
os.chdir("text-generation-webui")
>>>>>>> second-repo/main
run_cmd(f"python server.py {CMD_FLAGS}", environment=True) run_cmd(f"python server.py {CMD_FLAGS}", environment=True)
@ -249,12 +230,8 @@ if __name__ == "__main__":
update_dependencies() update_dependencies()
else: else:
# If webui has already been installed, skip and run # If webui has already been installed, skip and run
<<<<<<< HEAD
# if not os.path.exists("text-generation-webui/"): # if not os.path.exists("text-generation-webui/"):
if True: # TODO implement a new installation check if True: # TODO implement a new installation check
=======
if not os.path.exists("text-generation-webui/"):
>>>>>>> second-repo/main
install_dependencies() install_dependencies()
os.chdir(script_dir) os.chdir(script_dir)