Upload folder using huggingface_hub

.idea/workspace.xml

@@ -5,6 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f6135bf8-df9e-43b2-aa89-fa6954211078" name="Changes" comment="lora issue">
+      <change afterPath="$PROJECT_DIR$/.github/workflows/update_space.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/promptsModules/.~modelsConfig.xlsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/promptsModules/basePromptBuilder.py" beforeDir="false" afterPath="$PROJECT_DIR$/promptsModules/basePromptBuilder.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/promptsModules/modelsConfig.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/promptsModules/modelsConfig.xlsx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/prompt_rg.py" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/prompt_rg.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -49,6 +53,7 @@
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
@@ -139,7 +144,9 @@
       <workItem from="1693192262404" duration="7760000" />
       <workItem from="1693222831729" duration="4650000" />
       <workItem from="1693227796818" duration="194000" />
-      <workItem from="1693228084357" duration="1997000" />
+      <workItem from="1693228084357" duration="3923000" />
+      <workItem from="1693292652800" duration="4431000" />
+      <workItem from="1693307644817" duration="2314000" />
     </task>
     <task id="LOCAL-00001" summary="init">
       <option name="closed" value="true" />
@@ -397,7 +404,15 @@
       <option name="project" value="LOCAL" />
       <updated>1693226277283</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="update reqiurements">
+      <option name="closed" value="true" />
+      <created>1693307836718</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1693307836718</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -417,7 +432,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="code update" />
     <MESSAGE value="修改tab名" />
     <MESSAGE value="update ignore" />
     <MESSAGE value="format code" />
@@ -442,7 +456,8 @@
     <MESSAGE value="rename code" />
     <MESSAGE value="rename module" />
     <MESSAGE value="lora issue" />
-    <option name="LAST_COMMIT_MESSAGE" value="lora issue" />
+    <MESSAGE value="update reqiurements" />
+    <option name="LAST_COMMIT_MESSAGE" value="update reqiurements" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -452,11 +467,16 @@
           <line>109</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/promptsModules/basePromptBuilder.py</url>
+          <line>951</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/prompt_r_gen_sd$prompt_rg.coverage" NAME="prompt_rg Coverage Results" MODIFIED="1693226013078" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/scripts" />
+    <SUITE FILE_PATH="coverage/prompt_r_gen_sd$prompt_rg.coverage" NAME="prompt_rg Coverage Results" MODIFIED="1693309836604" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/scripts" />
     <SUITE FILE_PATH="coverage/prompt_r_gen_sd$model_manager.coverage" NAME="model_manager Coverage Results" MODIFIED="1693226005740" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/promptsModules" />
     <SUITE FILE_PATH="coverage/prompt_r_gen_sd$web_api.coverage" NAME="web_api Coverage Results" MODIFIED="1693223797704" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/scripts/promptsModules" />
     <SUITE FILE_PATH="coverage/prompt_r_gen_sd$sd_nsfw_random.coverage" NAME="sd_nsfw_random Coverage Results" MODIFIED="1692616884549" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/scripts/module" />

README.md

@@ -12,7 +12,7 @@ sdk_version: 3.40.1
 
 ~~目前仅支持画女孩提示词~~，其他待开发。
 
-功能预览：https://huggingface.co/spaces/heath1989/prompt-rp
+功能预览：[https://huggingface.co/spaces/heath1989/prompt-rp](https://huggingface.co/spaces/heath1989/prompt-r-gen-sd)
 
 ## 功能
 
@@ -60,6 +60,7 @@ sdk_version: 3.40.1
 1. xyz：Lora/Loha/embedding
 2. yxz：Loha/Lora/embedding
 3. zxy：embedding/Lora/loha
+
 ......
 
 

promptsModules/basePromptBuilder.py

@@ -953,19 +953,25 @@ def get_hair_prompt():
     if has_hair_length:
         prompt = prompt + get_random_from_list(hairLength)
 
-    hair_assign = get_assignment_prompt("hair_color")
-    if hair_assign == "":
-        prompt = ""
-    elif "r" in hair_assign or "random" in hair_assign:
+    enable_hair_color_random = get_config_value_by_key("hair_color")
+    target_hair_color = get_assignment_prompt("assign_hair_color")
+
+    if target_hair_color != "":
         if has_hair_length:
-            prompt = prompt + " and " + get_random_from_list(hairColor)
+            prompt = prompt + " and " + get_config_value_by_key("assign_hair_color") + " hair, "
         else:
-            prompt = prompt + get_random_from_list(hairColor)
+            prompt = prompt + get_config_value_by_key("assign_hair_color") + " hair, "
     else:
         if has_hair_length:
-            prompt = prompt + " and " + get_config_value_by_key("hair_color") + " hair"
+            if enable_hair_color_random:
+                prompt = prompt + " and " + get_standard_prompt(hairColor)
+            else:
+                prompt = prompt + " hair, "
         else:
-            prompt = prompt + get_config_value_by_key("hair_color") + " hair"
+            if enable_hair_color_random:
+                prompt = prompt + get_standard_prompt(hairColor)
+            else:
+                pass
 
     return prompt
 
@@ -1141,7 +1147,7 @@ def get_s_bottom_prompt():
 def get_assignment_prompt(the_assignment):
     the_value = get_config_value_by_key(the_assignment).lower()
     # check the_value, if is like nil, null, none, then return ""
-    if the_value == "nil" or the_value == "null" or the_value == "none" or the_value == "空":
+    if the_value == "nil" or the_value == "null" or the_value == "none" or the_value == "空" or the_value == "":
         return ""
     else:
         return "(" + get_config_value_by_key(the_assignment) + "), "
@@ -1312,7 +1318,7 @@ project_config = {
     # 颜色，只用给颜色即可
     "leg_wear_color": "",
     "shoes_color": "",
-    "hair_color": "",
+    "hair_color": False,
     "enable_eye_color": True,
     "disable_all_color": True,
     # 直接指定prompt，这会直接跳过其他配置，并且自动加深prompt权重
@@ -1324,6 +1330,7 @@ project_config = {
     "assign_body_clothes": "",
     "assign_panties": "",
     "assign_girl_description": "",
+    "assign_hair_color": "",  # 指定头发颜色
 
     # 装饰、物品、形容词
     "accessories_random_tims": 3,  # max:6 NOTE：对于某些model，如何这些prompt出现，可能会影响视角效果

requirements.txt

@@ -1 +1,2 @@
 openpyxl==3.1.2
+gradio==3.40.1

scripts/prompt_rg.py

@@ -74,13 +74,8 @@ def gen_action(gen_times, widget_lora, widget_lyco, widget_embeddings, model_ord
     else:
         project_config["assign_profession"] = assign_job
 
-    if hair_color and assign_hair_color == "":
-        project_config["hair_color"] = "random"
-    else:
-        if assign_hair_color == "":
-            project_config["hair_color"] = "null"
-        else:
-            project_config["hair_color"] = assign_hair_color
+    project_config["hair_color"] = hair_color
+    project_config["assign_hair_color"] = assign_hair_color
     project_config["add_hair_style"] = add_hair_style
     project_config["add_hair_length"] = hair_length
     project_config["enable_eye_color"] = enable_eye_color