Ke-san commited on
Commit
b9fb5f7
·
verified ·
1 Parent(s): 924405c

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +146 -39
app.py CHANGED
@@ -1,7 +1,7 @@
1
  import gradio as gr
2
  import pandas as pd
3
  import uuid
4
- from datetime import datetime
5
 
6
  # =========================
7
  # In-memory "DB"
@@ -11,6 +11,17 @@ STATE = {
11
  "bids": [] # {bid_id, job_id, contractor, price, duration_days, note, created_at, status}
12
  }
13
 
 
 
 
 
 
 
 
 
 
 
 
14
  def now_str():
15
  return datetime.now().strftime("%Y-%m-%d %H:%M:%S")
16
 
@@ -20,6 +31,21 @@ def yen(x):
20
  except:
21
  return "-"
22
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
  # =========================
24
  # View builders
25
  # =========================
@@ -37,7 +63,7 @@ def summarize():
37
  md = f"""
38
  # ギルドビルド(プロトタイプ)
39
 
40
- **目的:** 塗装案件の「依頼 → 入札 → 組合管理 → 成約」を透明化し、適正価格・適正期間で成立させる。
41
 
42
  ---
43
 
@@ -92,13 +118,48 @@ def bids_table(job_id=None):
92
  })
93
  return pd.DataFrame(rows)
94
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
95
  # =========================
96
  # Dropdown choices builders
97
  # =========================
98
  def list_open_jobs_for_bid_choices():
99
  """
100
  職人タブの「入札先案件(OPENのみ)」Dropdown 用 choices
101
- choice の value は job_id(短いID)に統一
102
  """
103
  opts = []
104
  for j in STATE["jobs"]:
@@ -123,45 +184,63 @@ def union_bid_choices_for_job(job_id):
123
  # =========================
124
  # Actions
125
  # =========================
126
- def create_job(title, area, budget_min, budget_max, deadline, details):
 
 
 
 
127
  # 必須チェック
128
- if not title or not area or not deadline:
129
- # UI更新(ヘッダーと表)は返しておく
130
  return (
131
- gr.Warning("タイトル・エリア・希望納期は必須です。"),
132
  summarize(),
133
  jobs_table(),
134
- gr.update(choices=list_open_jobs_for_bid_choices(), value=None), # 職人Dropdownも矛盾なく更新
 
 
135
  )
136
 
137
  job_id = "JOB-" + uuid.uuid4().hex[:8].upper()
 
 
138
  STATE["jobs"].append({
139
  "job_id": job_id,
140
  "title": title.strip(),
141
- "area": area.strip(),
142
  "budget_min": int(budget_min) if budget_min else 0,
143
  "budget_max": int(budget_max) if budget_max else 0,
144
- "deadline": deadline.strip(),
145
  "details": (details or "").strip(),
146
  "created_at": now_str(),
147
  "status": "OPEN",
148
  "approved_bid_id": None
149
  })
150
 
151
- # 作成直後に職人Dropdownを最新に(value は None にして不整合を防ぐ)
152
  return (
153
  gr.Info(f"案件を作成しました:{job_id}"),
154
  summarize(),
155
  jobs_table(),
156
  gr.update(choices=list_open_jobs_for_bid_choices(), value=None),
 
 
157
  )
158
 
159
- def refresh_jobs_dropdown():
160
- # 「案件リスト更新」ボタン用:choices を更新し、value は None に戻す
161
- return gr.update(choices=list_open_jobs_for_bid_choices(), value=None)
 
 
 
 
 
 
 
 
 
 
162
 
163
  def place_bid(job_id, contractor, price, duration_days, note):
164
- # job_id は Dropdown の value(job_id)で来る前提
165
  if not job_id:
166
  return gr.Warning("入札先の案件を選択してください。"), bids_table()
167
 
@@ -204,7 +283,6 @@ def approve_bid(job_id, bid_id):
204
  if job["status"] != "OPEN":
205
  return gr.Warning("この案件は募集中ではありません。"), summarize(), jobs_table(), bids_table(job_id), gr.update(choices=union_job_choices(), value=job_id or None)
206
 
207
- # 承認
208
  job["status"] = "MATCHED"
209
  job["approved_bid_id"] = bid_id
210
 
@@ -234,9 +312,11 @@ def reset_all():
234
  summarize(),
235
  jobs_table(),
236
  bids_table(),
237
- gr.update(choices=[], value=None), # 職人 Dropdown
238
- gr.update(choices=[], value=None), # 組合 案件 Dropdown
239
- gr.update(choices=[], value=None), # 組合 入札 Dropdown
 
 
240
  )
241
 
242
  # =========================
@@ -250,37 +330,53 @@ with gr.Blocks(title="ギルドビルド|プロトタイプ", theme=gr.themes.
250
 
251
  with gr.Tabs():
252
  # -------------------------
253
- # Owner (施主)
 
 
254
  # -------------------------
255
  with gr.Tab("施主:案件投稿"):
256
  gr.Markdown("## 案件を投稿する\n予算・希望納期・内容を入力して募集を開始します。")
257
 
258
  with gr.Row():
259
  title = gr.Textbox(label="タイトル(例:外壁塗装)", placeholder="外壁塗装/屋根塗装など")
260
- area = gr.Textbox(label="エリア(例:静岡県藤枝市)", placeholder="都道府県+市区町村")
 
261
 
262
  with gr.Row():
263
  budget_min = gr.Number(label="予算下限(円)", value=300000, precision=0)
264
  budget_max = gr.Number(label="予算上限(円)", value=800000, precision=0)
265
- deadline = gr.Textbox(label="希望納期(例:2月中旬まで / 2026-02-20)", placeholder="相対でもOK")
266
 
267
  details = gr.Textbox(label="詳細(任意)", lines=4, placeholder="建物の状態、面積の目安、希望条件など")
268
 
269
  create_btn = gr.Button("募集を開始(案件作成)", variant="primary")
270
  jobs_df_owner = gr.Dataframe(label="案件一覧", value=jobs_table(), interactive=False)
271
 
 
 
272
  # -------------------------
273
- # Contractor (職人)
 
 
 
274
  # -------------------------
275
  with gr.Tab("職人:入札"):
276
- gr.Markdown("## 募集中の案件に入札する\n価格と工期を自分で提示します。")
277
 
278
- job_choice = gr.Dropdown(
279
- label="入札先案件(OPENのみ)",
280
- choices=list_open_jobs_for_bid_choices(),
281
- value=None
 
 
 
 
 
 
 
 
282
  )
283
- refresh_jobs_btn = gr.Button("案件リスト更新")
284
 
285
  with gr.Row():
286
  contractor = gr.Textbox(label="職人名(仮)", placeholder="例:山田塗装")
@@ -293,16 +389,16 @@ with gr.Blocks(title="ギルドビルド|プロトタイプ", theme=gr.themes.
293
  bids_df_contractor = gr.Dataframe(label="この案件の入札一覧", value=bids_table(), interactive=False)
294
 
295
  refresh_jobs_btn.click(
296
- fn=refresh_jobs_dropdown,
297
  inputs=[],
298
- outputs=[job_choice],
299
  show_progress=False
300
  )
301
 
302
- bid_btn.click(
303
- fn=place_bid,
304
- inputs=[job_choice, contractor, price, duration_days, note],
305
- outputs=[gr.Textbox(visible=False), bids_df_contractor],
306
  show_progress=False
307
  )
308
 
@@ -313,8 +409,15 @@ with gr.Blocks(title="ギルドビルド|プロトタイプ", theme=gr.themes.
313
  show_progress=False
314
  )
315
 
 
 
 
 
 
 
 
316
  # -------------------------
317
- # Union (組合)
318
  # -------------------------
319
  with gr.Tab("組合:可視化・承認"):
320
  gr.Markdown("## 組合ダッシュボード\n入札状況を可視化し、承認してマッチングします。")
@@ -363,16 +466,18 @@ with gr.Blocks(title="ギルドビルド|プロトタイプ", theme=gr.themes.
363
  )
364
 
365
  # -------------------------
366
- # Wiring: create_job needs job_choice (職人dropdown) update too
367
  # -------------------------
368
  create_btn.click(
369
  fn=create_job,
370
- inputs=[title, area, budget_min, budget_max, deadline, details],
371
  outputs=[
372
  gr.Textbox(visible=False),
373
  header,
374
  jobs_df_owner,
375
- job_choice, # ← ここが改善の核心:施主で作成したら職人dropdownも更新
 
 
376
  ],
377
  show_progress=False
378
  )
@@ -389,6 +494,8 @@ with gr.Blocks(title="ギルドビルド|プロトタイプ", theme=gr.themes.
389
  jobs_df_owner,
390
  bids_df_union,
391
  job_choice,
 
 
392
  union_job,
393
  union_bid,
394
  ],
 
1
  import gradio as gr
2
  import pandas as pd
3
  import uuid
4
+ from datetime import datetime, date
5
 
6
  # =========================
7
  # In-memory "DB"
 
11
  "bids": [] # {bid_id, job_id, contractor, price, duration_days, note, created_at, status}
12
  }
13
 
14
+ # =========================
15
+ # Prefecture -> City master (prototype)
16
+ # =========================
17
+ PREF_CITIES = {
18
+ "静岡県": ["静岡市", "浜松市", "藤枝市", "焼津市", "沼津市", "富士市", "三島市"],
19
+ "東京都": ["千代田区", "港区", "新宿区", "渋谷区", "世田谷区", "台東区"],
20
+ "神奈川県": ["横浜市", "川崎市", "相模原市", "藤沢市", "鎌倉市"],
21
+ "愛知県": ["名古屋市", "豊田市", "岡崎市", "一宮市"],
22
+ "大阪府": ["大阪市", "堺市", "吹田市", "豊中市"],
23
+ }
24
+
25
  def now_str():
26
  return datetime.now().strftime("%Y-%m-%d %H:%M:%S")
27
 
 
31
  except:
32
  return "-"
33
 
34
+ def normalize_deadline(d):
35
+ """
36
+ gr.DateTime(include_time=False) が返す値を YYYY-MM-DD に正規化
37
+ """
38
+ if d is None:
39
+ return ""
40
+ if isinstance(d, str):
41
+ # 例: "2026-02-13 00:00:00" のような場合もあるので先頭10文字
42
+ return d[:10]
43
+ if isinstance(d, datetime):
44
+ return d.strftime("%Y-%m-%d")
45
+ if isinstance(d, date):
46
+ return d.strftime("%Y-%m-%d")
47
+ return str(d)[:10]
48
+
49
  # =========================
50
  # View builders
51
  # =========================
 
63
  md = f"""
64
  # ギルドビルド(プロトタイプ)
65
 
66
+ **目的:** 建築案件の「依頼 → 入札 → 組合管理 → 成約」を透明化し、適正価格・適正期間で成立させる。
67
 
68
  ---
69
 
 
118
  })
119
  return pd.DataFrame(rows)
120
 
121
+ # =========================
122
+ # Contractor "card-like" view helpers
123
+ # =========================
124
+ def open_jobs_table():
125
+ rows = []
126
+ for j in STATE["jobs"]:
127
+ if j["status"] == "OPEN":
128
+ rows.append({
129
+ "job_id": j["job_id"],
130
+ "タイトル": j["title"],
131
+ "エリア": j["area"],
132
+ "予算": f"{yen(j['budget_min'])}〜{yen(j['budget_max'])}",
133
+ "納期": j["deadline"],
134
+ })
135
+ return pd.DataFrame(rows)
136
+
137
+ def job_card_md(job_id):
138
+ j = next((x for x in STATE["jobs"] if x["job_id"] == job_id), None)
139
+ if not j:
140
+ return "(案件が見つかりません)"
141
+ details = j.get("details", "")
142
+ if details == "":
143
+ details = "(詳細なし)"
144
+ return f"""
145
+ <div style="border:1px solid #e5e7eb;border-radius:14px;padding:14px;background:#ffffff;">
146
+ <div style="font-size:18px;font-weight:700;margin-bottom:8px;">{j['title']}</div>
147
+ <div style="display:flex;gap:10px;flex-wrap:wrap;">
148
+ <div style="padding:6px 10px;border-radius:999px;background:#f3f4f6;">案件ID: <b>{j['job_id']}</b></div>
149
+ <div style="padding:6px 10px;border-radius:999px;background:#f3f4f6;">エリア: <b>{j['area']}</b></div>
150
+ <div style="padding:6px 10px;border-radius:999px;background:#f3f4f6;">予算: <b>{yen(j['budget_min'])}〜{yen(j['budget_max'])}</b></div>
151
+ <div style="padding:6px 10px;border-radius:999px;background:#f3f4f6;">希望納期: <b>{j['deadline']}</b></div>
152
+ </div>
153
+ <div style="margin-top:10px;color:#374151;white-space:pre-wrap;">{details}</div>
154
+ </div>
155
+ """
156
+
157
  # =========================
158
  # Dropdown choices builders
159
  # =========================
160
  def list_open_jobs_for_bid_choices():
161
  """
162
  職人タブの「入札先案件(OPENのみ)」Dropdown 用 choices
 
163
  """
164
  opts = []
165
  for j in STATE["jobs"]:
 
184
  # =========================
185
  # Actions
186
  # =========================
187
+ def update_city_choices(selected_pref):
188
+ cities = PREF_CITIES.get(selected_pref, [])
189
+ return gr.update(choices=cities, value=(cities[0] if cities else None))
190
+
191
+ def create_job(title, pref, city, budget_min, budget_max, deadline, details):
192
  # 必須チェック
193
+ if not title or not pref or not city or deadline is None:
 
194
  return (
195
+ gr.Warning("タイトル・都道府県・市区町村・希望納期は必須です。"),
196
  summarize(),
197
  jobs_table(),
198
+ gr.update(choices=list_open_jobs_for_bid_choices(), value=None),
199
+ open_jobs_table(),
200
+ "(案件を選ぶと詳細が表示されます)",
201
  )
202
 
203
  job_id = "JOB-" + uuid.uuid4().hex[:8].upper()
204
+ area = f"{pref}{city}"
205
+
206
  STATE["jobs"].append({
207
  "job_id": job_id,
208
  "title": title.strip(),
209
+ "area": area,
210
  "budget_min": int(budget_min) if budget_min else 0,
211
  "budget_max": int(budget_max) if budget_max else 0,
212
+ "deadline": normalize_deadline(deadline),
213
  "details": (details or "").strip(),
214
  "created_at": now_str(),
215
  "status": "OPEN",
216
  "approved_bid_id": None
217
  })
218
 
219
+ # 作成直後に「職人Dropdown」「職人案件表」も最新化(valueはNoneにして不整合防止)
220
  return (
221
  gr.Info(f"案件を作成しました:{job_id}"),
222
  summarize(),
223
  jobs_table(),
224
  gr.update(choices=list_open_jobs_for_bid_choices(), value=None),
225
+ open_jobs_table(),
226
+ "(案件を選ぶと詳細が表示されます)",
227
  )
228
 
229
+ def refresh_contractor_view():
230
+ return (
231
+ gr.update(choices=list_open_jobs_for_bid_choices(), value=None),
232
+ open_jobs_table(),
233
+ "(案件を選ぶと詳細が表示されます)"
234
+ )
235
+
236
+ def on_open_job_select(df, evt: gr.SelectData):
237
+ if df is None or len(df) == 0:
238
+ return gr.update(value=None), "(案件がありません)"
239
+ row = df.iloc[evt.index]
240
+ job_id = row["job_id"]
241
+ return gr.update(value=job_id), job_card_md(job_id)
242
 
243
  def place_bid(job_id, contractor, price, duration_days, note):
 
244
  if not job_id:
245
  return gr.Warning("入札先の案件を選択してください。"), bids_table()
246
 
 
283
  if job["status"] != "OPEN":
284
  return gr.Warning("この案件は募集中ではありません。"), summarize(), jobs_table(), bids_table(job_id), gr.update(choices=union_job_choices(), value=job_id or None)
285
 
 
286
  job["status"] = "MATCHED"
287
  job["approved_bid_id"] = bid_id
288
 
 
312
  summarize(),
313
  jobs_table(),
314
  bids_table(),
315
+ gr.update(choices=[], value=None), # 職人: dropdown
316
+ open_jobs_table(), # 職人: open jobs df
317
+ "(案件を選ぶと詳細が表示されます)", # 職人: card
318
+ gr.update(choices=[], value=None), # 組合: job dropdown
319
+ gr.update(choices=[], value=None), # 組合: bid dropdown
320
  )
321
 
322
  # =========================
 
330
 
331
  with gr.Tabs():
332
  # -------------------------
333
+ # Owner (施主) 変更点:
334
+ # - 日付をDateTime(カレンダー)
335
+ # - 県->市の連動Dropdown
336
  # -------------------------
337
  with gr.Tab("施主:案件投稿"):
338
  gr.Markdown("## 案件を投稿する\n予算・希望納期・内容を入力して募集を開始します。")
339
 
340
  with gr.Row():
341
  title = gr.Textbox(label="タイトル(例:外壁塗装)", placeholder="外壁塗装/屋根塗装など")
342
+ pref = gr.Dropdown(label="都道府県", choices=list(PREF_CITIES.keys()), value="静岡県")
343
+ city = gr.Dropdown(label="市区町村", choices=PREF_CITIES["静岡県"], value=PREF_CITIES["静岡県"][0])
344
 
345
  with gr.Row():
346
  budget_min = gr.Number(label="予算下限(円)", value=300000, precision=0)
347
  budget_max = gr.Number(label="予算上限(円)", value=800000, precision=0)
348
+ deadline = gr.DateTime(label="希望納期(カレンダー選択)", include_time=False)
349
 
350
  details = gr.Textbox(label="詳細(任意)", lines=4, placeholder="建物の状態、面積の目安、希望条件など")
351
 
352
  create_btn = gr.Button("募集を開始(案件作成)", variant="primary")
353
  jobs_df_owner = gr.Dataframe(label="案件一覧", value=jobs_table(), interactive=False)
354
 
355
+ pref.change(fn=update_city_choices, inputs=[pref], outputs=[city], show_progress=False)
356
+
357
  # -------------------------
358
+ # Contractor (職人) 変更点:
359
+ # - 案件一覧をDataframeで見せる
360
+ # - クリックで詳細カード表示
361
+ # - 選択した案件をDropdownに同期
362
  # -------------------------
363
  with gr.Tab("職人:入札"):
364
+ gr.Markdown("## 募集中の案件に入札する\n案件を一覧から選び、価格と工期を提示します。")
365
 
366
+ with gr.Row():
367
+ job_choice = gr.Dropdown(
368
+ label="入札先案件(選択中)",
369
+ choices=list_open_jobs_for_bid_choices(),
370
+ value=None
371
+ )
372
+ refresh_jobs_btn = gr.Button("案件リスト更新")
373
+
374
+ open_jobs_df = gr.Dataframe(
375
+ label="募集中案件(クリックで詳細表示)",
376
+ value=open_jobs_table(),
377
+ interactive=False
378
  )
379
+ selected_job_card = gr.Markdown("(案件を選ぶと詳細が表示されます)")
380
 
381
  with gr.Row():
382
  contractor = gr.Textbox(label="職人名(仮)", placeholder="例:山田塗装")
 
389
  bids_df_contractor = gr.Dataframe(label="この案件の入札一覧", value=bids_table(), interactive=False)
390
 
391
  refresh_jobs_btn.click(
392
+ fn=refresh_contractor_view,
393
  inputs=[],
394
+ outputs=[job_choice, open_jobs_df, selected_job_card],
395
  show_progress=False
396
  )
397
 
398
+ open_jobs_df.select(
399
+ fn=on_open_job_select,
400
+ inputs=[open_jobs_df],
401
+ outputs=[job_choice, selected_job_card],
402
  show_progress=False
403
  )
404
 
 
409
  show_progress=False
410
  )
411
 
412
+ bid_btn.click(
413
+ fn=place_bid,
414
+ inputs=[job_choice, contractor, price, duration_days, note],
415
+ outputs=[gr.Textbox(visible=False), bids_df_contractor],
416
+ show_progress=False
417
+ )
418
+
419
  # -------------------------
420
+ # Union (組合) 既存のまま
421
  # -------------------------
422
  with gr.Tab("組合:可視化・承認"):
423
  gr.Markdown("## 組合ダッシュボード\n入札状況を可視化し、承認してマッチングします。")
 
466
  )
467
 
468
  # -------------------------
469
+ # Wiring: create_job updates contractor views too
470
  # -------------------------
471
  create_btn.click(
472
  fn=create_job,
473
+ inputs=[title, pref, city, budget_min, budget_max, deadline, details],
474
  outputs=[
475
  gr.Textbox(visible=False),
476
  header,
477
  jobs_df_owner,
478
+ job_choice, # 職人: dropdown更新
479
+ open_jobs_df, # 職人: 表更新
480
+ selected_job_card # 職人: カード初期化
481
  ],
482
  show_progress=False
483
  )
 
494
  jobs_df_owner,
495
  bids_df_union,
496
  job_choice,
497
+ open_jobs_df,
498
+ selected_job_card,
499
  union_job,
500
  union_bid,
501
  ],