webscout 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

webscout/HelpingAI.py

@@ -1,192 +1,192 @@
-import warnings
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.common.exceptions import NoSuchElementException
-import time
-import os
-import requests
-from rich import print
-from dotenv import load_dotenv
-import random
-import string
-import json
-from typing import NoReturn, List, Dict, Union
-import requests
-from uuid import uuid4
-from re import findall
-from curl_cffi.requests import get, RequestsError
-import time
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-from halo import Halo
-
-class ChatBot:
-    def __init__(self):
-        load_dotenv()
-        options = Options()
-        options.add_argument('--no-sandbox')
-        options.add_argument('--headless')
-        options.add_argument('--disable-dev-shm-usage')
-        options.add_argument("start-maximized")
-        options.add_argument("disable-infobars")
-        options.add_argument("--disable-extensions")
-        options.add_argument("--disable-gpu")
-        options.add_argument("--disable-dev-shm-usage")
-        options.add_argument('--log-level=3')  # Add this line
-        warnings.simplefilter("ignore")
-        # Initialize WebDriver
-        self.driver = webdriver.Chrome(options=options)
-
-        self.HelpingAI = "https://vortex.zapier.app/"
-        # Navigate to the target URL
-        self.driver.get(self.HelpingAI)
-        time.sleep(7)
-
-        # Security Bypass: Refresh the page if the title contains 'just a moment'
-        while 'just a moment' in self.driver.title.lower():
-            self.driver.refresh()
-
-        # Initialize Chat_Num
-        self.Chat_Num = 2
-
-    # Function to increment Chat_Num
-    def increment_chat_num(self):
-        self.Chat_Num = str(int(self.Chat_Num) + 1)
-
-    # Function to send a query and retrieve response
-    def send_query(self, query):
-        text_box_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/textarea"
-        send_button_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/button"
-        response_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[2]"
-        button_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[1]/div/form/div/div[1]/button"
-
-        # Find the text box, enter query, and click send
-        text_box = self.driver.find_element(by=By.XPATH, value=text_box_xpath)
-        text_box.clear()
-        text_box.send_keys(query)
-        time.sleep(0.25)  # Pause for 1 second after typing query 
-
-        send_button = self.driver.find_element(by=By.XPATH, value=send_button_xpath)
-        send_button.click()
-
-        # Continuously check for the presence of the button every second
-        while True:
-            try:
-                button = self.driver.find_element(by=By.XPATH, value=button_xpath)
-                # If the button is found, retrieve and print the response
-                response = self.driver.find_element(by=By.XPATH, value=response_xpath).text
-                print("🤖:", response)
-                break
-            except NoSuchElementException:
-                time.sleep(0.25)  # If the button is not found, wait for 1 second before checking again
-
-        self.increment_chat_num()
-
-    # Function to ask the user for a query, send it, and print the response
-    def query_chat(self):
-        while True:
-            query = input("🧑: ")
-            if query.lower() == 'exit':
-                break
-
-            self.send_query(query)
-            time.sleep(0.25)  # Pause for 1 second before asking for the next query
-
-    # Close the browser window
-    def close(self):
-        self.driver.quit()
-        
-class WEBS:
-    def __init__(self):
-        load_dotenv()
-        options = Options()
-        options.add_argument('--no-sandbox')
-        options.add_argument('--headless')
-        options.add_argument('--disable-dev-shm-usage')
-        options.add_argument("start-maximized")
-        options.add_argument("disable-infobars")
-        options.add_argument("--disable-extensions")
-        options.add_argument("--disable-gpu")
-        options.add_argument("--disable-dev-shm-usage")
-        options.add_argument('--log-level=3')
-        warnings.simplefilter("ignore")
-        # Initialize WebDriver without specifying the path to the driver
-        self.driver = webdriver.Chrome(options=options)
-
-        self.HelpingAI = "https://vortex.zapier.app/"
-        # Navigate to the target URL
-        self.driver.get(self.HelpingAI)
-        time.sleep(7)
-
-        # Security Bypass: Refresh the page if the title contains 'just a moment'
-        while 'just a moment' in self.driver.title.lower():
-            self.driver.refresh()
-
-        # Initialize Chat_Num
-        self.Chat_Num =  2
-
-    # Function to increment Chat_Num
-    def increment_chat_num(self):
-        self.Chat_Num = str(int(self.Chat_Num) +  1)
-
-    # Function to send a query and retrieve response
-    def send_query(self, prompt):
-        text_box_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/textarea"
-        send_button_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/button"
-        response_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[2]"
-        button_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[1]/div/form/div/div[1]/button"
-
-        # Find the text box, enter prompt, and click send
-        text_box = self.driver.find_element(by=By.XPATH, value=text_box_xpath)
-        text_box.clear()
-        text_box.send_keys(prompt)
-        time.sleep(1)  # Pause for 1 second after typing prompt 
-
-        send_button = self.driver.find_element(by=By.XPATH, value=send_button_xpath)
-        send_button.click()
-
-        # Continuously check for the presence of the button every second
-        while True:
-            try:
-                button = self.driver.find_element(by=By.XPATH, value=button_xpath)
-                # If the button is found, retrieve and print the response
-                response = self.driver.find_element(by=By.XPATH, value=response_xpath).text
-                print("🤖:", response)
-                break
-            except NoSuchElementException:
-                time.sleep(0.25)  # If the button is not found, wait for 1 second before checking again
-
-        self.increment_chat_num()
-
-    # Function to perform web search
-    def web_search(self, query):
-        url = "https://abhaykoul-webscout1.hf.space/mws"
-        payload = {"query": query}
-        response = requests.post(url, json=payload)
-
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print("Error:", response.status_code)
-
-    # Function to ask the user for a prompt, send it, and print the response
-    def query_chat(self):
-        while True:
-            prompt = input("🧑: ")
-            if prompt.lower() == 'exit':
-                break
-            
-            # Perform web search
-            search_results = self.web_search(prompt)
-
-            # Pass the search results and the prompt to the AI
-            self.send_query(f"users question:{prompt} web search results: {search_results} Answer in HelpingAI style**note you have internet access and only use search_results when necessary also dont give links or urls (when users is asking something that needs realtime data)**")
-            time.sleep(0.25)  # Pause for 1 second before asking for the next prompt
-
-    # Close the browser window
-    def close(self):
-        self.driver.quit()
+import warnings
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.common.exceptions import NoSuchElementException
+import time
+import os
+import requests
+from rich import print
+from dotenv import load_dotenv
+import random
+import string
+import json
+from typing import NoReturn, List, Dict, Union
+import requests
+from uuid import uuid4
+from re import findall
+from curl_cffi.requests import get, RequestsError
+import time
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from halo import Halo
+
+class ChatBot:
+    def __init__(self):
+        load_dotenv()
+        options = Options()
+        options.add_argument('--no-sandbox')
+        options.add_argument('--headless')
+        options.add_argument('--disable-dev-shm-usage')
+        options.add_argument("start-maximized")
+        options.add_argument("disable-infobars")
+        options.add_argument("--disable-extensions")
+        options.add_argument("--disable-gpu")
+        options.add_argument("--disable-dev-shm-usage")
+        options.add_argument('--log-level=3')  # Add this line
+        warnings.simplefilter("ignore")
+        # Initialize WebDriver
+        self.driver = webdriver.Chrome(options=options)
+
+        self.HelpingAI = "https://vortex.zapier.app/"
+        # Navigate to the target URL
+        self.driver.get(self.HelpingAI)
+        time.sleep(7)
+
+        # Security Bypass: Refresh the page if the title contains 'just a moment'
+        while 'just a moment' in self.driver.title.lower():
+            self.driver.refresh()
+
+        # Initialize Chat_Num
+        self.Chat_Num = 2
+
+    # Function to increment Chat_Num
+    def increment_chat_num(self):
+        self.Chat_Num = str(int(self.Chat_Num) + 1)
+
+    # Function to send a query and retrieve response
+    def send_query(self, query):
+        text_box_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/textarea"
+        send_button_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/button"
+        response_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[2]"
+        button_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[1]/div/form/div/div[1]/button"
+
+        # Find the text box, enter query, and click send
+        text_box = self.driver.find_element(by=By.XPATH, value=text_box_xpath)
+        text_box.clear()
+        text_box.send_keys(query)
+        time.sleep(0.25)  # Pause for 1 second after typing query 
+
+        send_button = self.driver.find_element(by=By.XPATH, value=send_button_xpath)
+        send_button.click()
+
+        # Continuously check for the presence of the button every second
+        while True:
+            try:
+                button = self.driver.find_element(by=By.XPATH, value=button_xpath)
+                # If the button is found, retrieve and print the response
+                response = self.driver.find_element(by=By.XPATH, value=response_xpath).text
+                print("🤖:", response)
+                break
+            except NoSuchElementException:
+                time.sleep(0.25)  # If the button is not found, wait for 1 second before checking again
+
+        self.increment_chat_num()
+
+    # Function to ask the user for a query, send it, and print the response
+    def query_chat(self):
+        while True:
+            query = input("🧑: ")
+            if query.lower() == 'exit':
+                break
+
+            self.send_query(query)
+            time.sleep(0.25)  # Pause for 1 second before asking for the next query
+
+    # Close the browser window
+    def close(self):
+        self.driver.quit()
+        
+class WEBS:
+    def __init__(self):
+        load_dotenv()
+        options = Options()
+        options.add_argument('--no-sandbox')
+        options.add_argument('--headless')
+        options.add_argument('--disable-dev-shm-usage')
+        options.add_argument("start-maximized")
+        options.add_argument("disable-infobars")
+        options.add_argument("--disable-extensions")
+        options.add_argument("--disable-gpu")
+        options.add_argument("--disable-dev-shm-usage")
+        options.add_argument('--log-level=3')
+        warnings.simplefilter("ignore")
+        # Initialize WebDriver without specifying the path to the driver
+        self.driver = webdriver.Chrome(options=options)
+
+        self.HelpingAI = "https://vortex.zapier.app/"
+        # Navigate to the target URL
+        self.driver.get(self.HelpingAI)
+        time.sleep(7)
+
+        # Security Bypass: Refresh the page if the title contains 'just a moment'
+        while 'just a moment' in self.driver.title.lower():
+            self.driver.refresh()
+
+        # Initialize Chat_Num
+        self.Chat_Num =  2
+
+    # Function to increment Chat_Num
+    def increment_chat_num(self):
+        self.Chat_Num = str(int(self.Chat_Num) +  1)
+
+    # Function to send a query and retrieve response
+    def send_query(self, prompt):
+        text_box_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/textarea"
+        send_button_xpath = "/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/form/fieldset/button"
+        response_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[2]"
+        button_xpath = f"/html/body/div[1]/main/div[1]/div/div/div/div/div/div/div/div/div/div[{self.Chat_Num}]/div[1]/div/form/div/div[1]/button"
+
+        # Find the text box, enter prompt, and click send
+        text_box = self.driver.find_element(by=By.XPATH, value=text_box_xpath)
+        text_box.clear()
+        text_box.send_keys(prompt)
+        time.sleep(1)  # Pause for 1 second after typing prompt 
+
+        send_button = self.driver.find_element(by=By.XPATH, value=send_button_xpath)
+        send_button.click()
+
+        # Continuously check for the presence of the button every second
+        while True:
+            try:
+                button = self.driver.find_element(by=By.XPATH, value=button_xpath)
+                # If the button is found, retrieve and print the response
+                response = self.driver.find_element(by=By.XPATH, value=response_xpath).text
+                print("🤖:", response)
+                break
+            except NoSuchElementException:
+                time.sleep(0.25)  # If the button is not found, wait for 1 second before checking again
+
+        self.increment_chat_num()
+
+    # Function to perform web search
+    def web_search(self, query):
+        url = "https://abhaykoul-webscout1.hf.space/mws"
+        payload = {"query": query}
+        response = requests.post(url, json=payload)
+
+        if response.status_code == 200:
+            return response.json()
+        else:
+            print("Error:", response.status_code)
+
+    # Function to ask the user for a prompt, send it, and print the response
+    def query_chat(self):
+        while True:
+            prompt = input("🧑: ")
+            if prompt.lower() == 'exit':
+                break
+            
+            # Perform web search
+            search_results = self.web_search(prompt)
+
+            # Pass the search results and the prompt to the AI
+            self.send_query(f"users question:{prompt} web search results: {search_results} Answer in HelpingAI style**note you have internet access and only use search_results when necessary also dont give links or urls (when users is asking something that needs realtime data)**")
+            time.sleep(0.25)  # Pause for 1 second before asking for the next prompt
+
+    # Close the browser window
+    def close(self):
+        self.driver.quit()

webscout/LLM.py

@@ -1,68 +1,68 @@
-import argparse
-import requests
-import json
-from typing import List, Dict, Union
-
-class LLM:
-    def __init__(self, model: str, system_message: str = "You are a Helpful AI."):
-        self.model = model
-        self.conversation_history = [{"role": "system", "content": system_message}]
-
-    def mistral_chat(self, messages: List[Dict[str, str]]) -> Union[str, None]:
-        url = "https://api.deepinfra.com/v1/openai/chat/completions"
-        headers = {
-            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
-            'Accept-Language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
-            'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive',
-            'Content-Type': 'application/json',
-            'Origin': 'https://deepinfra.com',
-            'Pragma': 'no-cache',
-            'Referer': 'https://deepinfra.com/',
-            'Sec-Fetch-Dest': 'empty',
-            'Sec-Fetch-Mode': 'cors',
-            'Sec-Fetch-Site': 'same-site',
-            'X-Deepinfra-Source': 'web-embed',
-            'accept': 'text/event-stream',
-            'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"macOS"'
-        }
-        data = json.dumps(
-            {
-                'model': self.model,
-                'messages': messages,
-                'temperature': 0.7,
-                'max_tokens': 8028,
-                'stop': [],
-                'stream': False #dont change it
-            }, separators=(',', ':')
-        )
-        try:
-            result = requests.post(url=url, data=data, headers=headers)
-            return result.json()['choices'][0]['message']['content']
-        except:
-            return None
-
-    def chat(self):
-        while True:
-            prompt = input("👦: ")
-            user_message = {"role": "user", "content": prompt}
-            self.conversation_history.append(user_message)
-            try:
-                resp = self.mistral_chat(self.conversation_history)
-                print(f"🤖: {resp}")
-                self.conversation_history.append({"role": "assistant", "content": resp})
-            except Exception as e:
-                print(f"🤖: Oops, something went wrong: {e}! Looks like even AI needs some oiling sometimes.")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='LLM CLI', epilog='To use a specific model, run:\n'
-                                                                     'python -m webscout.LLM model_name\n'
-                                                                     'Replace "model_name" with the name of the model you wish to use It supports ALL text generation models on deepinfra.com.')
-    parser.add_argument('model', type=str, help='Model to use for text generation. Specify the full model name, e.g., "mistralai/Mistral-7B-Instruct-v0.1".')
-    parser.add_argument('--system-message', type=str, default="You are a Helpful AI.", help='Custom system prompt for the AI.')
-    args = parser.parse_args()
-
-    LLM = LLM(args.model, args.system_message)
+import argparse
+import requests
+import json
+from typing import List, Dict, Union
+
+class LLM:
+    def __init__(self, model: str, system_message: str = "You are a Helpful AI."):
+        self.model = model
+        self.conversation_history = [{"role": "system", "content": system_message}]
+
+    def mistral_chat(self, messages: List[Dict[str, str]]) -> Union[str, None]:
+        url = "https://api.deepinfra.com/v1/openai/chat/completions"
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+            'Accept-Language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            'Content-Type': 'application/json',
+            'Origin': 'https://deepinfra.com',
+            'Pragma': 'no-cache',
+            'Referer': 'https://deepinfra.com/',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-site',
+            'X-Deepinfra-Source': 'web-embed',
+            'accept': 'text/event-stream',
+            'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"macOS"'
+        }
+        data = json.dumps(
+            {
+                'model': self.model,
+                'messages': messages,
+                'temperature': 0.7,
+                'max_tokens': 8028,
+                'stop': [],
+                'stream': False #dont change it
+            }, separators=(',', ':')
+        )
+        try:
+            result = requests.post(url=url, data=data, headers=headers)
+            return result.json()['choices'][0]['message']['content']
+        except:
+            return None
+
+    def chat(self):
+        while True:
+            prompt = input("👦: ")
+            user_message = {"role": "user", "content": prompt}
+            self.conversation_history.append(user_message)
+            try:
+                resp = self.mistral_chat(self.conversation_history)
+                print(f"🤖: {resp}")
+                self.conversation_history.append({"role": "assistant", "content": resp})
+            except Exception as e:
+                print(f"🤖: Oops, something went wrong: {e}! Looks like even AI needs some oiling sometimes.")
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='LLM CLI', epilog='To use a specific model, run:\n'
+                                                                     'python -m webscout.LLM model_name\n'
+                                                                     'Replace "model_name" with the name of the model you wish to use It supports ALL text generation models on deepinfra.com.')
+    parser.add_argument('model', type=str, help='Model to use for text generation. Specify the full model name, e.g., "mistralai/Mistral-7B-Instruct-v0.1".')
+    parser.add_argument('--system-message', type=str, default="You are a Helpful AI.", help='Custom system prompt for the AI.')
+    args = parser.parse_args()
+
+    LLM = LLM(args.model, args.system_message)
     LLM.chat()

webscout/utils.py

@@ -1,38 +1,69 @@
 import json
 import re
+from decimal import Decimal
+from functools import lru_cache
 from html import unescape
-from typing import Optional
+from math import atan2, cos, radians, sin, sqrt
+from typing import Any, Dict, List, Union
 from urllib.parse import unquote
 
 from .exceptions import WebscoutE
 
+try:
+    import orjson
+except ModuleNotFoundError:
+    HAS_ORJSON = False
+else:
+    HAS_ORJSON = True
+
 REGEX_500_IN_URL = re.compile(r"(?:\d{3}-\d{2}\.js)")
 REGEX_STRIP_TAGS = re.compile("<.*?>")
-REGEX_VQD = re.compile(rb"""vqd=['"]?([^&"']+)""")
 
 
-def _extract_vqd(html_bytes: bytes, keywords: str) -> Optional[str]:
-    """Extract vqd from html using a regular expression."""
+def json_dumps(obj: Any) -> str:
+    try:
+        return orjson.dumps(obj).decode("utf-8") if HAS_ORJSON else json.dumps(obj)
+    except Exception as ex:
+        raise WebscoutE(f"{type(ex).__name__}: {ex}") from ex
+
+
+def json_loads(obj: Union[str, bytes]) -> Any:
     try:
-        match = REGEX_VQD.search(html_bytes)
-        if match:
-            return match.group(1).decode()
-    except Exception:
-        pass
+        return orjson.loads(obj) if HAS_ORJSON else json.loads(obj)
+    except Exception as ex:
+        raise WebscoutE(f"{type(ex).__name__}: {ex}") from ex
+
+
+def _extract_vqd(html_bytes: bytes, keywords: str) -> str:
+    """Extract vqd from html bytes."""
+    for c1, c1_len, c2 in (
+        (b'vqd="', 5, b'"'),
+        (b"vqd=", 4, b"&"),
+        (b"vqd='", 5, b"'"),
+    ):
+        try:
+            start = html_bytes.index(c1) + c1_len
+            end = html_bytes.index(c2, start)
+            return html_bytes[start:end].decode()
+        except ValueError:
+            pass
     raise WebscoutE(f"_extract_vqd() {keywords=} Could not extract vqd.")
 
 
-def _text_extract_json(html_bytes: bytes, keywords: str) -> Optional[str]:
+def _text_extract_json(html_bytes: bytes, keywords: str) -> List[Dict[str, str]]:
     """text(backend="api") -> extract json from html."""
     try:
         start = html_bytes.index(b"DDG.pageLayout.load('d',") + 24
         end = html_bytes.index(b");DDG.duckbar.load(", start)
         data = html_bytes[start:end]
-        return json.loads(data)
+        result: List[Dict[str, str]] = json_loads(data)
+        return result
     except Exception as ex:
         raise WebscoutE(f"_text_extract_json() {keywords=} {type(ex).__name__}: {ex}") from ex
+    raise WebscoutE(f"_text_extract_json() {keywords=} return None")
 
 
+@lru_cache
 def _is_500_in_url(url: str) -> bool:
     """Something like '506-00.js' inside the url."""
     return bool(REGEX_500_IN_URL.search(url))
@@ -46,3 +77,13 @@ def _normalize(raw_html: str) -> str:
 def _normalize_url(url: str) -> str:
     """Unquote URL and replace spaces with '+'."""
     return unquote(url.replace(" ", "+")) if url else ""
+
+
+def _calculate_distance(lat1: Decimal, lon1: Decimal, lat2: Decimal, lon2: Decimal) -> float:
+    """Calculate distance between two points in km. Haversine formula."""
+    R = 6371.0087714  # Earth's radius in km
+    rlat1, rlon1, rlat2, rlon2 = map(radians, [float(lat1), float(lon1), float(lat2), float(lon2)])
+    dlon, dlat = rlon2 - rlon1, rlat2 - rlat1
+    a = sin(dlat / 2) ** 2 + cos(rlat1) * cos(rlat2) * sin(dlon / 2) ** 2
+    c = 2 * atan2(sqrt(a), sqrt(1 - a))
+    return R * c

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "1.1.5"
+__version__ = "1.1.7"