collab_v2.0.0

Running

App Files Files Community

Ramesh-vani commited on May 29, 2024

Commit

90322fc

verified ·

1 Parent(s): 741bf6e

Update app.py

Browse files

Files changed (1) hide show

app.py +60 -45

app.py CHANGED Viewed

@@ -525,21 +525,30 @@ async def handle_user_input(websocket,key, process, connected,process_ids):
                     elif event["command"]["type"]=="write":
                         await wirte_file(websocket, key,event["project_name"], event["path"], event["content"], connected)
-                    elif event["command"]["type"]=="curl":
                         method = event.get("method", "GET")
                         url = event["url"]
                         body = event.get("data", "")
                         headers = event.get("headers", {})
                         if method.upper() == "GET":
                             response = requests.get(url, headers=headers)
                         elif method.upper() == "POST":
                             response = requests.post(url, data=body, headers=headers)
                         else:
                             response = {"error": "Unsupported method"}
                         # Parse HTML content
                         souptmp = BeautifulSoup(response.text, "html.parser")
                         # Step 1: Define the initial HTML string
                         html_str = """
                         <!DOCTYPE html>
@@ -547,7 +556,7 @@ async def handle_user_input(websocket,key, process, connected,process_ids):
                         <head>
                             <meta charset="UTF-8">
                             <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                            <title>Sample HTML</title>
                         </head>
                         <body>
                             <h1>Hello, World!</h1>
@@ -558,25 +567,23 @@ async def handle_user_input(websocket,key, process, connected,process_ids):
                         # Step 2: Parse the initial HTML content
                         soup = BeautifulSoup(html_str, 'html.parser')
-                        # Step 3: Define the new HTML snippet to replace the body content
-                        new_body_content = souptmp
-                        # Step 4: Parse the new HTML snippet
-                        new_body = BeautifulSoup(new_body_content, 'html.parser')
-                        # Step 5: Replace the existing body content with the new content
                         if soup.body:
                             soup.body.clear()
-                            soup.body.append(new_body)
                         else:
                             print("No <body> tag found in the HTML")
-                       # Inline CSS and JavaScript
                         soup = inline_resources(soup, url)
                         response_data = {
                             "type": "web-data",
                             "data": str(soup),
                         }
                         await websocket.send(json.dumps(response_data))
                     elif event["command"]["type"]=="create":
                         if event["item"]=="folder":
                             await create_folder(websocket, key,event["project_name"], event["path"],event["name"],event['root'],event['targetElementData'],event["rpath"], connected)
@@ -910,57 +917,65 @@ async def exe(websocket,connected,key,process_ids):
             elif event["command"]["type"]=="write":
                 await wirte_file(websocket, key,event["project_name"], event["path"], event["content"], connected)
-            elif event["command"]["type"]=="curl":
                 method = event.get("method", "GET")
                 url = event["url"]
                 body = event.get("data", "")
                 headers = event.get("headers", {})
                 if method.upper() == "GET":
                     response = requests.get(url, headers=headers)
                 elif method.upper() == "POST":
                     response = requests.post(url, data=body, headers=headers)
                 else:
                     response = {"error": "Unsupported method"}
                 # Parse HTML content
                 souptmp = BeautifulSoup(response.text, "html.parser")
-                        # Step 1: Define the initial HTML string
                 html_str = """
-                        <!DOCTYPE html>
-                        <html lang="en">
-                        <head>
-                            <meta charset="UTF-8">
-                            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                            <title>Sample HTML</title>
-                        </head>
-                        <body>
-                            <h1>Hello, World!</h1>
-                        </body>
-                        </html>
-                        """
-                        # Step 2: Parse the initial HTML content
                 soup = BeautifulSoup(html_str, 'html.parser')
-                        # Step 3: Define the new HTML snippet to replace the body content
-                new_body_content = souptmp
-                        # Step 4: Parse the new HTML snippet
-                new_body = BeautifulSoup(new_body_content, 'html.parser')
-                        # Step 5: Replace the existing body content with the new content
                 if soup.body:
-                            soup.body.clear()
-                            soup.body.append(new_body)
                 else:
-                            print("No <body> tag found in the HTML")
-                       # Inline CSS and JavaScript
                 soup = inline_resources(soup, url)
                 response_data = {
-                        "type": "web-data",
-                        "data": str(soup),
-                    }
                 await websocket.send(json.dumps(response_data))
             elif event["command"]["type"]=="create":
                 if event["item"]=="folder":
                     await create_folder(websocket, key,event["project_name"], event["path"],event["name"],event['root'],event['targetElementData'],event["rpath"], connected)

                     elif event["command"]["type"]=="write":
                         await wirte_file(websocket, key,event["project_name"], event["path"], event["content"], connected)
+                    elif event["command"]["type"] == "curl":
                         method = event.get("method", "GET")
                         url = event["url"]
                         body = event.get("data", "")
                         headers = event.get("headers", {})
                         if method.upper() == "GET":
                             response = requests.get(url, headers=headers)
                         elif method.upper() == "POST":
                             response = requests.post(url, data=body, headers=headers)
                         else:
                             response = {"error": "Unsupported method"}
+                        if isinstance(response, dict):
+                            response_data = {
+                                "type": "error",
+                                "data": response,
+                            }
+                            await websocket.send(json.dumps(response_data))
+                            return
                         # Parse HTML content
                         souptmp = BeautifulSoup(response.text, "html.parser")
                         # Step 1: Define the initial HTML string
                         html_str = """
                         <!DOCTYPE html>
                         <head>
                             <meta charset="UTF-8">
                             <meta name="viewport" content="width=device-width, initial-scale=1.0">
                         </head>
                         <body>
                             <h1>Hello, World!</h1>
                         # Step 2: Parse the initial HTML content
                         soup = BeautifulSoup(html_str, 'html.parser')
+                        # Step 3: Replace the existing body content with the new content from souptmp
                         if soup.body:
                             soup.body.clear()
+                            for content in souptmp.body.contents:
+                                soup.body.append(content)
                         else:
                             print("No <body> tag found in the HTML")
+                        # Inline CSS and JavaScript
                         soup = inline_resources(soup, url)
                         response_data = {
                             "type": "web-data",
                             "data": str(soup),
                         }
                         await websocket.send(json.dumps(response_data))
                     elif event["command"]["type"]=="create":
                         if event["item"]=="folder":
                             await create_folder(websocket, key,event["project_name"], event["path"],event["name"],event['root'],event['targetElementData'],event["rpath"], connected)
             elif event["command"]["type"]=="write":
                 await wirte_file(websocket, key,event["project_name"], event["path"], event["content"], connected)
+            elif event["command"]["type"] == "curl":
                 method = event.get("method", "GET")
                 url = event["url"]
                 body = event.get("data", "")
                 headers = event.get("headers", {})
                 if method.upper() == "GET":
                     response = requests.get(url, headers=headers)
                 elif method.upper() == "POST":
                     response = requests.post(url, data=body, headers=headers)
                 else:
                     response = {"error": "Unsupported method"}
+                if isinstance(response, dict):
+                    response_data = {
+                        "type": "error",
+                        "data": response,
+                    }
+                    await websocket.send(json.dumps(response_data))
+                    return
                 # Parse HTML content
                 souptmp = BeautifulSoup(response.text, "html.parser")
+                # Step 1: Define the initial HTML string
                 html_str = """
+                <!DOCTYPE html>
+                <html lang="en">
+                <head>
+                    <meta charset="UTF-8">
+                    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                </head>
+                <body>
+                    <h1>Hello, World!</h1>
+                </body>
+                </html>
+                """
+                # Step 2: Parse the initial HTML content
                 soup = BeautifulSoup(html_str, 'html.parser')
+                # Step 3: Replace the existing body content with the new content from souptmp
                 if soup.body:
+                    soup.body.clear()
+                    for content in souptmp.body.contents:
+                        soup.body.append(content)
                 else:
+                    print("No <body> tag found in the HTML")
+                # Inline CSS and JavaScript
                 soup = inline_resources(soup, url)
                 response_data = {
+                    "type": "web-data",
+                    "data": str(soup),
+                }
                 await websocket.send(json.dumps(response_data))
             elif event["command"]["type"]=="create":
                 if event["item"]=="folder":
                     await create_folder(websocket, key,event["project_name"], event["path"],event["name"],event['root'],event['targetElementData'],event["rpath"], connected)