isrpa 1.0.9__py3-none-any.whl → 1.1.1__py3-none-any.whl

isrpa/utils.py

@@ -24,13 +24,10 @@ def getPath(user_name):
     :return:
     """
 
-    # address = os.environ.get("address", "192.168.12.249")
-
     url = f"{address}/client/getPath"
     headers = {
-        'Content-Type': 'application/json',  # 说明请求体是 JSON 格式
+        'Content-Type': 'application/json',
     }
-    # 请求体的数据
     data = {
         'user_name': user_name
     }
@@ -64,7 +61,7 @@ def get_ssh_path(user_name):
 
     def get_ws_url():
         url = f"http://localhost:{port}/json/version"
-        response = requests.get(url)
+        response = requests.get(url, headers={"Connection": "close"}, stream=True)
         if response.status_code != 200:
             return "failure"
         return response.json().get('webSocketDebuggerUrl')
@@ -73,6 +70,41 @@ def get_ssh_path(user_name):
     return ws_url
 
 
+def get_url(user_name):
+    """
+    获取当前激活page对象
+    """
+    url = f"{address}/client/getPath"
+    headers = {'Content-Type': 'application/json'}
+    data = {'user_name': user_name}
+    response = requests.post(url, headers=headers, json=data)
+    if response.status_code != 200:
+        return "failure"
+    data = response.json()
+    port = data.get('port')
+
+    def get_json():
+        url = f"http://localhost:{port}/json"
+        response = requests.get(url, headers={"Connection": "close"}, stream=True)
+        if response.status_code != 200:
+            return "failure"
+        return response.json()
+
+    pages = get_json()
+    if pages:
+        for page in pages:
+            if (
+                    page.get("url").startswith("chrome-extension://") or
+                    page.get("url").startswith("chrome-untrusted://") or
+                    page.get("title") == "MagicalAutomator-sidePanel"
+            ):
+                continue
+            else:
+                if page.get("url") == "chrome://newtab/":
+                    return "chrome://new-tab-page/"
+                return page.get("url")
+    return None
+
 def get_active_url(user_name):
     """
     获取当前激活page对象
@@ -88,7 +120,7 @@ def get_active_url(user_name):
 
     def get_json():
         url = f"http://localhost:{port}/json"
-        response = requests.get(url)
+        response = requests.get(url, headers={"Connection": "close"}, stream=True)
         if response.status_code != 200:
             return "failure"
         return response.json()
@@ -102,9 +134,6 @@ def get_active_url(user_name):
                     page.get("title") == "MagicalAutomator-sidePanel"
             ):
                 continue
-            # else:
-            #     if page.get("url") == "chrome://newtab/":
-            #         return "chrome://new-tab-page/"
             return page.get("id")
     return None
 
@@ -134,12 +163,10 @@ def upload_file(file_path, dest_file, user_name):
     :return:
     """
 
-    # address = os.environ.get("address", "192.168.12.249")
     url = f"{address}/client/noticeUpload"
     headers = {
-        'Content-Type': 'application/json',  # 说明请求体是 JSON 格式
+        'Content-Type': 'application/json',
     }
-    # 请求体的数据
     data = {
         'file_path': file_path,
         'dest_file': dest_file,
@@ -159,10 +186,9 @@ def vCode(image: str, code_type, apiKey, secretKey):
     """
     url = "https://ai.i-search.com.cn/ocr/v2/vCode"
     headers = {
-        'Content-Type': 'application/json',  # 说明请求体是 JSON 格式
+        'Content-Type': 'application/json',
     }
 
-    # 请求体的数据
     data = {
         'image': image,
         'code_type': code_type,

{isrpa-1.0.9.dist-info → isrpa-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isrpa
-Version: 1.0.9
+Version: 1.1.1
 Summary: isrpa package
 Home-page: https://github.com/yourusername/mypackage
 Author: ysq

{isrpa-1.0.9.dist-info → isrpa-1.1.1.dist-info}/RECORD

@@ -5,8 +5,8 @@ isrpa/__init__.py,sha256=pG-YPVG0gJIJ6s4xcAz9S_CnUxpUcz33wl9eNUSgxGk,20
 isrpa/credentials.py,sha256=5paT4rxtZIUPqADmi1bLkoSKEYoosgS7rIjrJsgMNIs,3350
 isrpa/llm_chat.py,sha256=jTuK9wcm3X36V9lXuGuTCdNup_zi2NeG2GuYHzO7gm4,1541
 isrpa/message.py,sha256=N0s6hMaC5S-Pi4EhwcSp-ngfBTBQyW6ymU9sI9dUSeE,11329
-isrpa/utils.py,sha256=HTX3luyrOayq9bBLyNLdLkANSntp5LdFGWXps1Dknsc,5682
-isrpa-1.0.9.dist-info/METADATA,sha256=E7FUX5kvfZ02XgMygRPCSDcZiznw-rri2L9rH-OFp2s,511
-isrpa-1.0.9.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-isrpa-1.0.9.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
-isrpa-1.0.9.dist-info/RECORD,,
+isrpa/utils.py,sha256=opHSj0unbVPaeQid2_Lgyub1YbEJFGtUzZF0_JnvcVE,6516
+isrpa-1.1.1.dist-info/METADATA,sha256=pOEYQHr7xRAavJC2PcgRsBPsPDmC918dvO-yFuAJdNo,511
+isrpa-1.1.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+isrpa-1.1.1.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
+isrpa-1.1.1.dist-info/RECORD,,