環境ファイルの追加

app.py

@@ -7,7 +7,13 @@ from bs4 import BeautifulSoup
 
 
 
-def generate_cloud(text, width, height):
+def generate_cloud(*args):
+    text, width, height, background_color = args
+
+    # default setting
+    width = width if width is not None else 1024
+    height = height if height is not None else 768
+
     t = Tokenizer()
 
     tokens = t.tokenize(text)
@@ -16,7 +22,8 @@ def generate_cloud(text, width, height):
         width=int(width), 
         height=int(height), 
         regexp="[\w']+", 
-        font_path="./ipaexm00401/ipaexm.ttf")
+        font_path="./ipaexm00401/ipaexm.ttf",
+        background_color=background_color)
 
     nouns = [token.base_form for token in tokens if token.part_of_speech.startswith('名詞')]
     nouns = (" ").join(nouns)
@@ -24,16 +31,8 @@ def generate_cloud(text, width, height):
     return wc.to_array()
 
 
-def generate_cloud_from_text(text, width, height):
-    
-    # default setting
-    width = width if width is not None else 1024
-    height = height if height is not None else 768
-
-    return generate_cloud(text, width, height)
-
-
-def generate_cloud_from_url(url, width, height):
+def get_text_from_url(*args):
+    url, width, height, background_color = args
     
     # URLからHTMLを取得
     html = urlopen(url)
@@ -41,19 +40,17 @@ def generate_cloud_from_url(url, width, height):
     # HTMLからbodyのテキストを抽出
     soup = BeautifulSoup(html, "html.parser")
     body_text = soup.body.get_text()
-    # default setting
-    width = width if width is not None else 1024
-    height = height if height is not None else 768
 
-    return generate_cloud(body_text, width, height)
+    return generate_cloud(body_text, width, height, background_color)
 
 
 from_text = gr.Interface(
-    fn=generate_cloud_from_text, 
+    fn=generate_cloud, 
     inputs=[
         gr.Textbox(label="入力テキスト"),
         gr.Number(value=1024, label="横幅（デフォルト値：1024）"),
-        gr.Number(value=768, label="高さ（デフォルト値：768）")
+        gr.Number(value=768, label="高さ（デフォルト値：768）"),
+        gr.Radio(choices=["black", "white"], value="black", label="背景色")
         ], 
     outputs=gr.Image(type="pil"),
     title="☁️にほんご　わーどくらうど☁"
@@ -61,11 +58,12 @@ from_text = gr.Interface(
 
 
 from_url = gr.Interface(
-    fn=generate_cloud_from_url, 
+    fn=get_text_from_url, 
     inputs=[
         gr.Textbox(label="URL"),
         gr.Number(value=1024, label="横幅（デフォルト値：1024）"),
-        gr.Number(value=768, label="高さ（デフォルト値：768）")
+        gr.Number(value=768, label="高さ（デフォルト値：768）"),
+        gr.Radio(choices=["black", "white"], value="black", label="背景色")
         ], 
     outputs=gr.Image(type="pil"),
     title="☁️にほんご　わーどくらうど☁"

requirements.txt

@@ -5,6 +5,7 @@ altair==4.2.0
 anyio==3.6.2
 async-timeout==4.0.2
 attrs==22.2.0
+beautifulsoup4==4.11.1
 certifi==2022.12.7
 charset-normalizer==2.1.1
 click==8.1.3
@@ -52,6 +53,7 @@ requests==2.28.2
 rfc3986==1.5.0
 six==1.16.0
 sniffio==1.3.0
+soupsieve==2.3.2.post1
 starlette==0.22.0
 toolz==0.12.0
 typing_extensions==4.4.0