박하늘 / stock_chatbot

Go to a project
Toggle navigation Toggle navigation pinning
Ubuntu
95447879 2 parents 3e5b407c f1c2d34f

update files

Expand all
Inline Side-by-side
Showing 3 changed files with 21 additions and 7 deletions
This diff is collapsed. Click to expand it.
...@@ -10,7 +10,12 @@ def get_matches(query, choices, limit=3): ...@@ -10,7 +10,12 @@ def get_matches(query, choices, limit=3):
10 return result 10 return result
11 11
12 def basicinform(input): 12 def basicinform(input):
13 +<<<<<<< HEAD
13 stocks = pd.read_csv('stockcodename.csv', index_col=0) 14 stocks = pd.read_csv('stockcodename.csv', index_col=0)
15 +=======
16 + stocks = pd.read_csv('stockcodename.csv', names=['Symbol', 'Market', 'Name'
17 + , 'Sector', 'Industry', 'ListingDate', 'SettleMonth', 'Represetitive', 'HomePage', 'Region'], index_col=0)
18 +>>>>>>> f1c2d34f3272bc7cfebf6e887b72493185c4c57c
14 symbol = '' 19 symbol = ''
15 20
16 for i in enumerate(stocks.Name): 21 for i in enumerate(stocks.Name):
...@@ -23,8 +28,8 @@ def basicinform(input): ...@@ -23,8 +28,8 @@ def basicinform(input):
23 cand = '' 28 cand = ''
24 for i in fuzzy: 29 for i in fuzzy:
25 cand += i[0] 30 cand += i[0]
26 - cand += " " 31 + cand += "\n"
27 - cand += "중 찾는게 있으신가요? \n다시 입력해주세요." 32 + cand += "중 찾는게 있으신가요? 다시 입력해주세요."
28 return cand 33 return cand
29 34
30 df = fdr.DataReader(symbol) 35 df = fdr.DataReader(symbol)
...@@ -33,13 +38,22 @@ def basicinform(input): ...@@ -33,13 +38,22 @@ def basicinform(input):
33 price = df.Close.iloc[-1] 38 price = df.Close.iloc[-1]
34 ror = ror_df[-1] 39 ror = ror_df[-1]
35 40
36 - value = { 41 + ror = round(ror, 4)
37 - "현재가": price, 42 + ror = ror * 100
38 - "거래랑": volume, 43 + value = ''
39 - "전일 대비 수익률:": ror 44 + value = "1현재가: " + str(price) + "원\n거래랑: " + str(volume) + "건\n전일대비: " + str(ror) + "%"
40 - } 45 + # value = {
46 + # "현재가": price,
47 + # "거래랑": volume,
48 + # "전일 대비 수익률:": ror
49 + # }
41 return value 50 return value
42 51
43 52
53 +<<<<<<< HEAD
54 +=======
55 +# print(basicinform('호텔신라'))
56 +
57 +>>>>>>> f1c2d34f3272bc7cfebf6e887b72493185c4c57c
44 args = sys.argv 58 args = sys.argv
45 print(basicinform(args[0])) 59 print(basicinform(args[0]))
......
This diff is collapsed. Click to expand it.