Update app.py

app.py

@@ -1,105 +1,66 @@
-import streamlit as st
-import requests
-
-def main():
-    st.title("集合操作アプリ")
-
-    # メニューの選択
-    option = st.sidebar.selectbox("機能を選択してください", ["集合の操作", "全体集合の生成", "補集合の計算", "不等式の計算"])
-
-    if option == "集合の操作":
-        set_operations()
-    elif option == "全体集合の生成":
-        generate_universe()
-    elif option == "補集合の計算":
-        complement_operation()
-    elif option == "不等式の計算":
-        inequality_solver()
-
-def set_operations():
-    st.header("集合の操作")
-
-    with st.form(key='set_operations_form'):
-        set1 = st.text_input("集合1 (カンマ区切りで要素を入力してください)", "1,2,3")
-        set2 = st.text_input("集合2 (カンマ区切りで要素を入力してください)", "3,4,5")
-        set3 = st.text_input("集合3 (カンマ区切りで要素を入力してください)", "5,6,7")
-        submit_button = st.form_submit_button(label='実行')
-
-    if submit_button:
-        response = requests.post("http://127.0.0.1:8000/set_operations", json={
-            "set1": set1,
-            "set2": set2,
-            "set3": set3
-        })
-        if response.status_code == 200:
-            result = response.json()
-            st.subheader("集合の操作結果")
-            st.write("和集合:", result["union"])
-            st.write("積集合:", result["intersection"])
-            st.write("差集合:", result["difference"])
-            st.write("対称差:", result["symmetric_difference"])
-        else:
-            st.error(response.json()["detail"])
-
-def generate_universe():
-    st.header("全体集合の生成")
-
-    with st.form(key='generate_universe_form'):
-        initial_value = st.number_input("初期値", value=0)
-        step = st.number_input("ステップ", value=1)
-        num_steps = st.number_input("回数", value=10, min_value=1)
-        submit_button = st.form_submit_button(label='生成')
-
-    if submit_button:
-        response = requests.post("http://127.0.0.1:8000/generate_universe", json={
-            "initial_value": initial_value,
-            "step": step,
-            "num_steps": num_steps
-        })
-        if response.status_code == 200:
-            result = response.json()
-            st.subheader("生成された全体集合")
-            st.write(result["universe_set"])
-        else:
-            st.error(response.json()["detail"])
-
-def complement_operation():
-    st.header("補集合の計算")
-
-    with st.form(key='complement_operation_form'):
-        universe = st.text_input("全体集合 (カンマ区切りで要素を入力してください)", "1,2,3,4,5,6,7,8,9,10")
-        target_set = st.text_input("対象集合 (カンマ区切りで要素を入力してください)", "1,3,5")
-        submit_button = st.form_submit_button(label='計算')
-
-    if submit_button:
-        response = requests.post("http://127.0.0.1:8000/complement_operation", json={
-            "universe": universe,
-            "target_set": target_set
-        })
-        if response.status_code == 200:
-            result = response.json()
-            st.subheader("補集合の計算結果")
-            st.write(result["complement"])
-        else:
-            st.error(response.json()["detail"])
-
-def inequality_solver():
-    st.header("不等式の計算")
-
-    with st.form(key='inequality_solver_form'):
-        inequality_input = st.text_input("不等式を入力してください", "2*x >= 2")
-        submit_button = st.form_submit_button(label='解を求める')
-
-    if submit_button:
-        response = requests.post("http://127.0.0.1:8000/inequality_solver", json={
-            "inequality": inequality_input
-        })
-        if response.status_code == 200:
-            result = response.json()
-            st.subheader("不等式の解")
-            st.write(result["solution"])
-        else:
-            st.error(response.json()["detail"])
+from fastapi import FastAPI
+from pydantic import BaseModel
+from typing import List, Set
+
+app = FastAPI()
+
+class SetOperationInput(BaseModel):
+    set1: List[int]
+    set2: List[int]
+    set3: List[int]
+
+class UniverseInput(BaseModel):
+    initial_value: int
+    step: int
+    num_steps: int
+
+class ComplementInput(BaseModel):
+    universe: List[int]
+    target_set: List[int]
+
+class InequalityInput(BaseModel):
+    inequality: str
+
+@app.post("/set_operations/")
+def set_operations(input_data: SetOperationInput):
+    set1 = set(input_data.set1)
+    set2 = set(input_data.set2)
+    set3 = set(input_data.set3)
+    
+    result = {
+        "union": list(set1.union(set2, set3)),
+        "intersection": list(set1.intersection(set2, set3)),
+        "difference": list(set1.difference(set2, set3)),
+        "symmetric_difference": list(set1.symmetric_difference(set2))
+    }
+    
+    return result
+
+@app.post("/generate_universe/")
+def generate_universe(input_data: UniverseInput):
+    initial_value = input_data.initial_value
+    step = input_data.step
+    num_steps = input_data.num_steps
+    universe_set = list(range(initial_value, initial_value + step * num_steps, step))
+    
+    return {"universe": universe_set}
+
+@app.post("/complement_operation/")
+def complement_operation(input_data: ComplementInput):
+    universe_set = set(input_data.universe)
+    target_set = set(input_data.target_set)
+    complement = list(universe_set.difference(target_set))
+    
+    return {"complement": complement}
+
+@app.post("/inequality_solver/")
+def inequality_solver(input_data: InequalityInput):
+    x = symbols('x')
+    inequality = eval(input_data.inequality)
+    solution = solve(inequality, x)
+    
+    return {"solution": str(solution)}
 
 if __name__ == "__main__":
-    main()
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=7860)