Merge pull request #18 from LyaaaaaGames/Develop

Release 1.2.2
LyaaaaaGames · Apr 2, 2023 · d7042be · d7042be
2 parents b840a5d + 81ea151
commit d7042be
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 42 deletions.
diff --git a/conda_config.yml b/conda_config.yml
@@ -1,13 +1,12 @@
 name: aidventure
 channels:
-  - defaults
   - conda-forge
   - pytorch
 dependencies:
   - pip
   - python=3.9.7
-  - pytorch=1.12
-  - websockets=10.0
-  - transformers=4.21
+  - pytorch
+  - websockets=10.4
+  - transformers=4.27
   - sentencepiece
-  - accelerate=0.12.0
+  - accelerate
diff --git a/conda_config_cuda.yml b/conda_config_cuda.yml
@@ -1,15 +1,14 @@
 name: aidventure
 channels:
-  - defaults
   - conda-forge
   - pytorch
 dependencies:
   - pip
   - python=3.9.7
-  - pytorch=1.12
-  - websockets=10.0
-  - transformers=4.21
+  - pytorch
+  - websockets=10.4
+  - transformers=4.27
   - sentencepiece
-  - accelerate=0.12.0
-  - torchvision=0.12
+  - accelerate
+  - torchvision
   - cudatoolkit
diff --git a/install.sh b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #---------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- author : Lyaaaaa
 #--
@@ -23,9 +23,12 @@
 #--
 #--   22/05/2022 Lyaaaaa
 #--     - Uncommented "download_conda" and "install_conda" as it breaks the installer. Oups...
+#--
+#--   01/04/2023 Lyaaaaa
+#--     - Updated the miniconda link to use the newest version : 23.1.0-1.
 #---------------------------------------------------------------------------
 
-mini_conda_link="https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh"
+mini_conda_link="https://repo.anaconda.com/miniconda/Miniconda3-py39_23.1.0-1-Linux-x86_64.sh"
 cache_folder="cache"
 environment_prefix="server/miniconda/"
 conda_environment_file="conda_config"

diff --git a/run.sh b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #---------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- author : Lyaaaaa
 #--

diff --git a/server/config.py b/server/config.py
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- author : Lyaaaaa
 #--
@@ -26,6 +26,9 @@
 #--   21/05/2022 Lyaaaaa
 #--     - Set LOG_FILEMODE default value to 'w'
 #--     - Set LOG_LEVEL default value to DEBUG (Experimental branch only)
+#--
+#--   09/11/2022 Lyaaaaa
+#--     - Set LOG_LEVEL default value back to INFO
 #---------------------------------------------------------------------------
 
 import logging
@@ -37,4 +40,4 @@
 # Logs
 LOG_FILENAME = "server_logs.text"
 LOG_FILEMODE = "w"
-LOG_LEVEL    = logging.DEBUG
+LOG_LEVEL    = logging.INFO
diff --git a/server/downloader.py b/server/downloader.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/server/generator.py b/server/generator.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--
@@ -17,9 +17,18 @@
 #--  - 22/05/2022 Lyaaaaa
 #--    - Updated generate_text to support the gpu once again. Simplified the
 #--        script by merging all the models input into a single dict "model_input".
+#--
+#--  - 01/03/2022 Lyaaaaa
+#--    - Added GenerationConfig import from transformers.
+#--    - Because max_length has been replaced by max_new_tokens, it is no more
+#--        needed to have max_length = max_length + model_input's length.
+#--    - p_parameters aren't sent into generate() anymore. They are now given
+#--        to a GenerationConfig object which is an attribute (generation_config)
+#--        of the Model. generate() automatically uses these config.
 #------------------------------------------------------------------------------
 
 from model import Model
+from transformers import GenerationConfig
 
 class Generator(Model):
 
@@ -38,10 +47,9 @@ def generate_text(self,
     if self.is_gpu_enabled:
       model_input.to("cuda")
 
-    p_parameters["max_length"] += len(model_input[0])
+    self._Model.generation_config = GenerationConfig(**p_parameters)
 
-    model_output = self._Model.generate(**model_input,
-                                        **p_parameters)
+    model_output = self._Model.generate(**model_input)
     generated_text = self._Tokenizer.decode(model_output[0], skip_special_tokens=True)
 
     return generated_text
diff --git a/server/json_utils.py b/server/json_utils.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/server/logger.py b/server/logger.py
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- author : Lyaaaaa
 #--

diff --git a/server/model.py b/server/model.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--
@@ -114,6 +114,9 @@
 #--    - Extracted a log print from _enable_gpu to _disable_gpu
 #--    - Updated _empty_gpu_cache to torch.no_grad() otherwise the memory stays
 #--        in use. Even with this solution a few hundreds of MB stays in use...
+#--
+#--  - 01/04/2023 Lyaaaaa
+#--    - Updated __init__ to declare attribute generation_config.
 #------------------------------------------------------------------------------
 
 from transformers import AutoModelForCausalLM, AutoModelForSeq2SeqLM, AutoTokenizer
@@ -145,6 +148,8 @@ def __init__(self,
     self.is_gpu_enabled    = False
     self._model_type       = p_model_type
     self._low_memory_mode  = p_low_memory_mode
+    self.generation_config = None
+
 
     if self._load() == False:
       self._download()

diff --git a/server/model_type.py b/server/model_type.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/server/request.py b/server/request.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/server/server.py b/server/server.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/server/translator.py b/server/translator.py
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- Author : Lyaaaaaaaaaaaaaaa
 #--

diff --git a/style_guide.md b/style_guide.md
@@ -9,8 +9,8 @@ Each python script must start with this header.
 
 ```
 #---------------------------------------------------------------------------
-#-- Copyright (c) 2021-2022 LyaaaaaGames
-#-- Copyright (c) 2022 AIdventure_Server contributors
+#-- Copyright (c) 2021-present LyaaaaaGames
+#-- Copyright (c) 2022-present AIdventure_Server contributors
 #--
 #-- author :
 #--