Dependence removal

environment.yml

@@ -6,7 +6,6 @@ channels:
   - defaults
 
 dependencies:
-  - requests
   - pillow
   - pydantic
   - httpx
@@ -20,7 +19,6 @@ dependencies:
   - black
   - flake8
   - mypy
-  - types-requests
   - types-Pillow
   - build
   - twine

setup.py

@@ -21,7 +21,6 @@ def readme():
     packages=["streetview"],
     zip_safe=False,
     install_requires=[
-        "requests",
         "pillow",
         "pydantic",
         "httpx"

streetview/api.py

@@ -1,7 +1,7 @@
 from io import BytesIO
 from typing import Dict, Union
 
-import requests
+import httpx
 from PIL import Image
 from pydantic import BaseModel
 
@@ -31,7 +31,7 @@ def get_panorama_meta(pano_id: str, api_key: str) -> MetaData:
         "https://maps.googleapis.com/maps/api/streetview/metadata"
         f"?pano={pano_id}&key={api_key}"
     )
-    resp = requests.get(url)
+    resp = httpx.get(url)
     return MetaData(**resp.json())
 
 
@@ -73,6 +73,7 @@ def get_streetview(
         "key": api_key,
     }
 
-    response = requests.get(url, params=params, stream=True)
-    img = Image.open(BytesIO(response.content))
-    return img
+    with httpx.stream("GET", url, params=params) as response:
+        response.read()
+        img = Image.open(BytesIO(response.content))
+        return img

streetview/download.py

@@ -7,7 +7,6 @@
 from typing import AsyncGenerator, Generator, Tuple
 
 import httpx
-import requests
 from PIL import Image
 
 async_client = httpx.AsyncClient()
@@ -56,12 +55,13 @@ def fetch_panorama_tile(
     """
     for _ in range(max_retries):
         try:
-            response = requests.get(tile_info.fileurl, stream=True)
-            return Image.open(BytesIO(response.content))
-        except requests.ConnectionError:
+            with httpx.stream("GET", tile_info.fileurl) as response:
+                response.read()
+                return Image.open(BytesIO(response.content))
+        except httpx.RequestError:
             print("Connection error. Trying again in 2 seconds.")
             time.sleep(2)
-    raise requests.ConnectionError("Max retries exceeded.")
+    raise httpx.RequestError("Max retries exceeded.")
 
 
 async def fetch_panorama_tile_async(

streetview/search.py

@@ -2,9 +2,8 @@
 import re
 from typing import List, Optional
 
-import requests
+import httpx
 from pydantic import BaseModel
-from requests.models import Response
 
 
 class Panorama(BaseModel):
@@ -34,13 +33,13 @@ def make_search_url(lat: float, lon: float) -> str:
     return url.format(lat, lon)
 
 
-def search_request(lat: float, lon: float) -> Response:
+def search_request(lat: float, lon: float) -> httpx.Response:
     """
     Gets the response of the script on Google's servers that returns the
     closest panoramas (ids) to a give GPS coordinate.
     """
     url = make_search_url(lat, lon)
-    return requests.get(url)
+    return httpx.get(url)
 
 
 def extract_panoramas(text: str) -> List[Panorama]:
@@ -83,7 +82,7 @@ def extract_panoramas(text: str) -> List[Panorama]:
             pitch=pano[2][2][1] if len(pano[2][2]) >= 2 else None,
             roll=pano[2][2][2] if len(pano[2][2]) >= 3 else None,
             date=dates[i] if i < len(dates) else None,
-            elevation=pano[3][0],
+            elevation=pano[3][0] if len(pano) >= 4 else None,
         )
         for i, pano in enumerate(raw_panos)
     ]