Update app.py

app.py

@@ -168,228 +168,7 @@ async def post_chat(
         print("---",result.new_messages_json(),"---")
         #print("***",prompt,"***")
         #await database.add_messages(result.new_messages_json())
-    async def ds_messages(prompt1):
-         try:
-            prompt2=f"{prompt1}. Hari ini adalah tanggal {date.today()}"              
-            yield (
-                json.dumps(
-                    {
-                        'role': 'user',
-                        'timestamp': datetime.now(tz=timezone.utc).isoformat(),
-                        'content': prompt1,
-                    }
-                ).encode('utf-8')
-                + b'\n'
-            )
-            #messages = await database.get_messages()
-            async with agent.run_stream(prompt2) as result:
-                async for text in result.stream(debounce_by=0.1):
-                    m = ModelResponse.from_text(content=text, timestamp=result.timestamp())
-                    yield json.dumps(to_ds_message(m)).encode('utf-8') + b'\n'
-                
-            ##print(result.usage())
-            #await database.add_messages(result.new_messages_json())
-            darso = json.loads(result.new_messages_json())
-            #print(darso)
-            darso0= darso[0]
-            #darso0.pop(darso0['parts'][0])
-            #print("00|------------------")
-            #print("01|", darso0 )
-            #print("01a|", darso0['parts'][0] )
-            #print("01b|", darso0['parts'][1] )
-            darso0['parts'][0] = darso0['parts'][1]
-            #print("01?|", darso0 ) 
-            #print("01??|", darso ) 
-            #print("02|------------------")
-            darso1= darso[1] 
-            #print("1|", darso1)
-            darso2= json.loads(json.dumps(darso1))
-            #print("2|",darso2['parts'][0])
-            darso3= darso2['parts'][0]
-            darso4= json.loads(json.dumps(darso3))
-            #print("4|",darso4['content'])
-            darso5= darso4['content']
-            darso5=darso5.split('```', 2)
-            darso5=darso5[1]
-            #print("5a|",darso5)
-            darso5=darso5.replace('json', '')
-            #print("5|",darso5,"|")
-            try:
-                darso6= json.loads(darso5) #json
-                darso7= SalesOrder.model_validate(darso6)
-            except:
-                darso6= "ERR"
-            #print("6|",darso6,"|")
-            if "ds_items" in darso5:
-                cek_str="ds_items"
-            else:
-                cek_str="--"
-            if darso6=="ERR":
-                ds_id = time.time()
-                ds_salesOrderId = "ERR"
-                ds_salesDate = 'ERR'
-                ds_customerName="-"
-                ds_customerAddress="-"
-                    
-                ds_productName1 = "Produk1 --- "
-                ds_quantity1  = 1
-                ds_unitPrice1 = 0
-                ds_itemAmt1   = 0
-                
-                ds_productName2 = "Produk2 --- "
-                ds_quantity2  = 0
-                ds_unitPrice2 = 0
-                ds_itemAmt2   = 0
-                
-                ds_productName3 = "Produk3 --- "
-                ds_quantity3  = 0
-                ds_unitPrice3 = 0
-                ds_itemAmt3   = 0 
-                ds_shippingAddress=""
-                ds_shippingCost=0
-                ds_totalAmount=0
-            else:
-                ds_id = time.time()
-                ds_salesOrderId = "OK"
-                ds_salesDate = 'OK'
-                try:
-                    ds_salesOrderId = darso7.ds_salesOrderId
-                    #print("7|ds_salesOrderId")
-                    ds_salesDate  = darso7.ds_salesDate
-                    #print("7|ds_salesDate")
-                    ds_customerName=f"""{darso7.ds_customerName}"""
-                    #print("7|ds_customerName:",ds_customerName)
-                    ds_customerAddress=f"""{darso7.ds_customerAddress}"""
-                    #print("7|ds_customerAddress:", len(darso7.ds_items))
-                    ds_productName1 = darso7.ds_items[0].ds_productName
-                    #print("7|ds_productName1")
-                    ds_quantity1  = darso7.ds_items[0].ds_quantity
-                    #print("7|ds_quantity1")
-                    ds_unitPrice1 = darso7.ds_items[0].ds_unitPrice
-                    #print("7|ds_unitPrice1")
-                    ds_itemAmt1   = darso7.ds_items[0].ds_itemAmt
-                    #print("7|ds_itemAmt1")
-                    ds_productName2 = "-"
-                    ds_quantity2  = 0
-                    ds_unitPrice2 = 0
-                    ds_itemAmt2   = 0
-                    ds_productName3 = "-"
-                    ds_quantity3  = 0
-                    ds_unitPrice3 = 0
-                    ds_itemAmt3   = 0 
-                    
-                    if len(darso7.ds_items)>1:
-                        ds_productName2 = darso7.ds_items[1].ds_productName
-                        ds_quantity2  = darso7.ds_items[1].ds_quantity
-                        ds_unitPrice2 = darso7.ds_items[1].ds_unitPrice
-                        ds_itemAmt2   = darso7.ds_items[1].ds_itemAmt
-                    if len(darso7.ds_items)>2:
-                        ds_productName3 = darso7.ds_items[2].ds_productName
-                        ds_quantity3  = darso7.ds_items[2].ds_quantity
-                        ds_unitPrice3 = darso7.ds_items[2].ds_unitPrice
-                        ds_itemAmt3   = darso7.ds_items[2].ds_itemAmt 
-                    
-                    ds_shippingCost=darso7.ds_shippingCost
-                    #print("7|ds_shippingCost")
-                    ds_shippingAddress=f"""{darso7.ds_shippingAddress}"""
-                    #print("7|ds_shippingAddress")
-                    ds_totalAmount=darso7.ds_totalAmount
-                    #print("7|ds_totalAmount")
-                except:
-                    ds_salesOrderId = "OK2"
-                    ds_salesDate = 'OK2'
-                    ds_customerName="-"
-                    ds_customerAddress="-"
-                    
-                    ds_productName1 = "Produk1"
-                    ds_quantity1  = 0
-                    ds_unitPrice1 = 0
-                    ds_itemAmt1   = 0
-                    
-                    ds_productName2 = "Produk2"
-                    ds_quantity2  = 0
-                    ds_unitPrice2 = 0
-                    ds_itemAmt2   = 0
-                    
-                    ds_productName3 = "Produk3"
-                    ds_quantity3  = 0
-                    ds_unitPrice3 = 0
-                    ds_itemAmt3   = 0 
-                    ds_shippingAddress=""
-                    ds_shippingCost=0
-                    ds_totalAmount=0
-                
-            formDs = f"""
-           
-  <form id="myaiForm{ds_id}" action="javascript:abcde({ds_id});" class="form-container">
-    <h3>Pesanan</h3>
-    	<table>
-            <tr>
-                <td><label for="ds_salesOrderId"><b>SO#</b></label><input type="text" placeholder="" name="ds_salesOrderId" value="{ds_salesOrderId}"></td>
-                <td><label for="ds_salesDate"><b>Date</b></label><input type="text" placeholder="" name="ds_salesDate" value="{ds_salesDate}"></td>
-            </tr>
-            <tr>
-      <td colspan="2"><label for="ds_customerName"><b>Customer</b></label><input type="text" placeholder="" name="ds_customerName" value="{ds_customerName}"></td>
-            </tr>
-            <tr>
- <td colspan="2"><label for="ds_customerAddress"><b>Alamat</b></label><input type="text" placeholder="" name="ds_customerAddress" value="{ds_customerAddress}"></td>
-            </tr>
-        </table style="width:100%">
-    <b>Item Barang:</b>
-        <table>
-            <tr><th>Prod</th><th  style="text-align: center;">Qty</th><th  style="text-align: center;">Prc</th><th  style="text-align: center;">Rp</th></tr>
-            <tr>
-                <td><input type="text" placeholder="-" name="ds_productName1" value="{ds_productName1}"></td>
-                <td><input type="text" style="text-align: center;" name="ds_quantity1" value={ds_quantity1}></td>
-                <td><input type="text" style="text-align: center;" name="ds_unitPrice1" value={ds_unitPrice1}></td>
-                <td><input type="text" style="text-align: center;" name="ds_itemAmt1" value={ds_itemAmt1}></td>
-            </tr>
-            <tr>
-                <td><input type="text" placeholder="-" name="ds_productName2" value="{ds_productName2}"></td>
-                <td><input type="text"  style="text-align: center;" name="ds_quantity2" value={ds_quantity2}></td>
-                <td><input type="text"  style="text-align: center;" name="ds_unitPrice2" value={ds_unitPrice2}></td>
-                <td><input type="text"  style="text-align: center;" name="ds_itemAmt2" value={ds_itemAmt2}></td>
-            </tr>
-            <tr>
-                <td><input type="text" placeholder="-" name="ds_productName3" value="{ds_productName3}"></td>
-                <td><input type="text"  style="text-align: center;" name="ds_quantity3" value={ds_quantity3}></td>
-                <td><input type="text"  style="text-align: center;" name="ds_unitPrice3" value={ds_unitPrice3}></td>
-                <td><input type="text"  style="text-align: center;" name="ds_itemAmt3" value={ds_itemAmt3}></td>
-            </tr>
-        </table>
-        <table>
-            <tr>
-                <td  style="text-align: center;"><b>Ongkir</b></td>
-                <td  style="text-align: center;"><b>Total</b></td>
-            </tr>
-            <tr>
-                <td><input type="text"  style="text-align: center;" placeholder="0" name="ds_shippingCost" value={ds_shippingCost}></td>
-                <td><input type="text"  style="text-align: center;" placeholder="0" name="ds_totalAmount" value={ds_totalAmount}></td>
-            </tr>
-            <tr>
-      <td colspan="2"><label for="ds_shippingAddress"><b></b></label><input type="text" placeholder="" name="ds_shippingAddress" value="{ds_shippingAddress}"></td>
-            </tr>            
-        </table>
-        <button type="submit" class="btn">Submit</button>
-        <button type="button" class="btn cancel" onclick="closeAiForm({ds_id})">Close</button>
-  </form>
-  <form id="myaiForm2{ds_id}" class="form-container" style="display:none;">
-        <button type="button" class="btn umum" onclick="openAiForm({ds_id})">Open Form</button>
-  </form>
-                """
-            m = ModelResponse.from_text(content=formDs, timestamp=result.timestamp())
-            yield json.dumps(to_ds_message(m)).encode('utf-8') + b'\n'
-            print("OK")
-            #await database.add_messages(result.new_messages_json())
-            await database.add_messages(json.dumps(darso))
-            ##print(len(items))
-            #darso7 = SalesOrder.model_validate(darso6)
-            #print("[--",darso7.ds_customerName,"--]")
-            #darso8 = darso7.ds_items[0]
-            ##, len(darso7.ds_items)
-            #print("[--",darso8.ds_productName,"--]")
-        except ValueError as e:
-            print(e)     
+   
     if prompt[0] == "@" : 
         #print("@@@", prompt, "@@@")
         nn = len(prompt)