linpershey commited on
Commit
8aa4241
1 Parent(s): 104c8cf

remove business id from ui

Browse files
Files changed (2) hide show
  1. app.py +8 -4
  2. model.py +2 -2
app.py CHANGED
@@ -43,16 +43,19 @@ def format_category( formatted_results):
43
  f"> 描述:{formatted_results['description'].values[0]}"
44
  ])
45
 
46
- def do( business_id, business_name, address):
47
  """
48
  """
49
 
50
  crawled_results = []
 
 
51
 
52
  google_domain = "google.com.tw"
53
  gl = 'tw'
54
  lr = 'lang_zh-TW'
55
-
 
56
  query = compose_query(address, business_name)
57
  try:
58
  res = get_serp( query, google_domain, gl, lr)
@@ -72,7 +75,7 @@ def do( business_id, business_name, address):
72
 
73
  crawled_results = pd.DataFrame(crawled_results)
74
  # logger.debug(crawled_results)
75
- extracted_results = extract_results( crawled_results, classes=classes)
76
  # logger.error(extracted_results['extracted_results'].columns)
77
  extracted_results = extracted_results['extracted_results'][ [ 'business_id', 'business_name', 'address', 'category', 'evidence', 'phone_number', 'description', 'store_name'] ]
78
  logger.debug( extracted_results['category'])
@@ -100,7 +103,8 @@ def do( business_id, business_name, address):
100
  with gr.Blocks() as demo:
101
  gr.Markdown("🌟 自動分類餐廳型態 🌟")
102
  with gr.Row():
103
- inputs = [ gr.Textbox( label="統一編號", placeholder="輸入八碼數字(optional)"), gr.Textbox( label="商家名稱", placeholder="輸入商家或公司名稱"), gr.Textbox(label="地址", placeholder="至少輸入縣市,完整地址更好")]
 
104
  with gr.Row():
105
  # outputs = [gr.Dataframe(row_count = (1, "dynamic"), col_count=(6,"dynamic"), label="output data", interactive=1)]
106
  outputs = [ gr.Markdown( label="參考資料(google search)"), gr.Image( label="文字雲"), gr.Markdown( label="類別", )]
 
43
  f"> 描述:{formatted_results['description'].values[0]}"
44
  ])
45
 
46
+ def do( business_name: str, address: str):
47
  """
48
  """
49
 
50
  crawled_results = []
51
+ provider = 'openai'
52
+ model = 'gpt-4-0125-preview'
53
 
54
  google_domain = "google.com.tw"
55
  gl = 'tw'
56
  lr = 'lang_zh-TW'
57
+ business_id = 12345678
58
+
59
  query = compose_query(address, business_name)
60
  try:
61
  res = get_serp( query, google_domain, gl, lr)
 
75
 
76
  crawled_results = pd.DataFrame(crawled_results)
77
  # logger.debug(crawled_results)
78
+ extracted_results = extract_results( crawled_results, classes=classes, provider = provider, model = model)
79
  # logger.error(extracted_results['extracted_results'].columns)
80
  extracted_results = extracted_results['extracted_results'][ [ 'business_id', 'business_name', 'address', 'category', 'evidence', 'phone_number', 'description', 'store_name'] ]
81
  logger.debug( extracted_results['category'])
 
103
  with gr.Blocks() as demo:
104
  gr.Markdown("🌟 自動分類餐廳型態 🌟")
105
  with gr.Row():
106
+ # gr.Textbox( label="統一編號", placeholder="輸入八碼數字(optional)"),
107
+ inputs = [ gr.Textbox( label="商家名稱", placeholder="輸入商家或公司名稱"), gr.Textbox(label="地址", placeholder="至少輸入縣市,完整地址更好")]
108
  with gr.Row():
109
  # outputs = [gr.Dataframe(row_count = (1, "dynamic"), col_count=(6,"dynamic"), label="output data", interactive=1)]
110
  outputs = [ gr.Markdown( label="參考資料(google search)"), gr.Image( label="文字雲"), gr.Markdown( label="類別", )]
model.py CHANGED
@@ -10,7 +10,7 @@ from utils import parse_json_garbage
10
 
11
  load_dotenv()
12
 
13
- def llm( provider, model, system_prompt, user_content, delay:int = 10):
14
  """Invoke LLM service
15
  Argument
16
  --------
@@ -28,7 +28,7 @@ def llm( provider, model, system_prompt, user_content, delay:int = 10):
28
  """
29
  if delay:
30
  time.sleep(delay)
31
-
32
  if provider=='openai':
33
  client = OpenAI( organization = os.getenv('ORGANIZATION_ID'))
34
  chat_completion = client.chat.completions.create(
 
10
 
11
  load_dotenv()
12
 
13
+ def llm( provider, model, system_prompt, user_content, delay:int = 0):
14
  """Invoke LLM service
15
  Argument
16
  --------
 
28
  """
29
  if delay:
30
  time.sleep(delay)
31
+
32
  if provider=='openai':
33
  client = OpenAI( organization = os.getenv('ORGANIZATION_ID'))
34
  chat_completion = client.chat.completions.create(