update search, add new versions to docs

Author: vlad-outscraper

README.md

@@ -35,13 +35,13 @@ results = client.google_search_news('election', language='en')
 
 ```python
 # Search for businesses in specific locations:
-results = client.google_maps_search('restaurants brooklyn usa', limit=20, language='en')
+results = client.google_maps_search_v2('restaurants brooklyn usa', limit=20, language='en')
 
 # Get data of the specific place by id
-results = client.google_maps_search('ChIJrc9T9fpYwokRdvjYRHT8nI4', language='en')
+results = client.google_maps_search_v2('ChIJrc9T9fpYwokRdvjYRHT8nI4', language='en')
 
 # Search with many queries (batching)
-results = client.google_maps_search([
+results = client.google_maps_search_v2([
     'restaurants brooklyn usa',
     'bars brooklyn usa',
 ], language='en')
@@ -52,16 +52,16 @@ results = client.google_maps_search([
 
 ```python
 # Get reviews of the specific place by id
-results = client.google_maps_reviews('ChIJrc9T9fpYwokRdvjYRHT8nI4', reviews_limit=20, language='en')
+results = client.google_maps_reviews_v3('ChIJrc9T9fpYwokRdvjYRHT8nI4', reviews_limit=20, language='en')
 
 # Get reviews for places found by search query
-results = client.google_maps_reviews('Memphis Seoul brooklyn usa', reviews_limit=20, limit=500, language='en')
+results = client.google_maps_reviews_v3('Memphis Seoul brooklyn usa', reviews_limit=20, limit=500, language='en')
 
 # Get only new reviews during last 24 hours
 from datetime import datetime, timedelta
 yesterday_timestamp = int((datetime.now() - timedelta(1)).timestamp())
 
-results = client.google_maps_reviews(
+results = client.google_maps_reviews_v3(
     'ChIJrc9T9fpYwokRdvjYRHT8nI4', sort='newest', cutoff=yesterday_timestamp, reviews_limit=100, language='en')
 ```
 

README.rst

@@ -49,13 +49,13 @@ Scrape Google Maps (Places)
 .. code:: python
 
    # Search for businesses in specific locations:
-   results = client.google_maps_search('restaurants brooklyn usa', limit=20, language='en')
+   results = client.google_maps_search_v2('restaurants brooklyn usa', limit=20, language='en')
 
    # Get data of the specific place by id
-   results = client.google_maps_search('ChIJrc9T9fpYwokRdvjYRHT8nI4', language='en')
+   results = client.google_maps_search_v2('ChIJrc9T9fpYwokRdvjYRHT8nI4', language='en')
 
    # Search with many queries (batching)
-   results = client.google_maps_search([
+   results = client.google_maps_search_v2([
        'restaurants brooklyn usa',
        'bars brooklyn usa',
    ], language='en')
@@ -66,16 +66,16 @@ Scrape Google Maps Reviews
 .. code:: python
 
    # Get reviews of the specific place by id
-   results = client.google_maps_reviews('ChIJrc9T9fpYwokRdvjYRHT8nI4', reviews_limit=20, language='en')
+   results = client.google_maps_reviews_v3('ChIJrc9T9fpYwokRdvjYRHT8nI4', reviews_limit=20, language='en')
 
    # Get reviews for places found by search query
-   results = client.google_maps_reviews('Memphis Seoul brooklyn usa', reviews_limit=20, limit=500, language='en')
+   results = client.google_maps_reviews_v3('Memphis Seoul brooklyn usa', reviews_limit=20, limit=500, language='en')
 
    # Get only new reviews during last 24 hours
    from datetime import datetime, timedelta
    yesterday_timestamp = int((datetime.now() - timedelta(1)).timestamp())
 
-   results = client.google_maps_reviews(
+   results = client.google_maps_reviews_v3(
        'ChIJrc9T9fpYwokRdvjYRHT8nI4', sort='newest', cutoff=yesterday_timestamp, reviews_limit=100, language='en')
 
 Scrape Google Maps Photos

outscraper/api_client.py

@@ -85,37 +85,6 @@ def _wait_request_archive(self, request_id: str) -> dict:
         raise Exception('Timeout exceeded')
 
     def google_search(self, query: list, pages_per_query: int = 1, uule = '', language: str = 'en', region: str = None, fields: list = None) -> list:
-        '''
-            Get data from Google search
-
-                    Parameters:
-                            query (list | str): parameter defines the query or queries you want to search on Google. Using a lists allows multiple queries (up to 25) to be sent in one request and save on network latency time.
-                            pages_per_query (int): parameter specifies the limit of pages to return from one query.
-                            uule (str): Google UULE parameter is used to encode a place or an exact location (with latitude and longitude) into a code. By using it you can see a Google result page like someone located at the specified location.
-                            language (str): parameter specifies the language to use for Google. Available values: "en", "de", "es", "es-419", "fr", "hr", "it", "nl", "pl", "pt-BR", "pt-PT", "vi", "tr", "ru", "ar", "th", "ko", "zh-CN", "zh-TW", "ja", "ach", "af", "ak", "ig", "az", "ban", "ceb", "xx-bork", "bs", "br", "ca", "cs", "sn", "co", "cy", "da", "yo", "et", "xx-elmer", "eo", "eu", "ee", "tl", "fil", "fo", "fy", "gaa", "ga", "gd", "gl", "gn", "xx-hacker", "ht", "ha", "haw", "bem", "rn", "id", "ia", "xh", "zu", "is", "jw", "rw", "sw", "tlh", "kg", "mfe", "kri", "la", "lv", "to", "lt", "ln", "loz", "lua", "lg", "hu", "mg", "mt", "mi", "ms", "pcm", "no", "nso", "ny", "nn", "uz", "oc", "om", "xx-pirate", "ro", "rm", "qu", "nyn", "crs", "sq", "sk", "sl", "so", "st", "sr-ME", "sr-Latn", "su", "fi", "sv", "tn", "tum", "tk", "tw", "wo", "el", "be", "bg", "ky", "kk", "mk", "mn", "sr", "tt", "tg", "uk", "ka", "hy", "yi", "iw", "ug", "ur", "ps", "sd", "fa", "ckb", "ti", "am", "ne", "mr", "hi", "bn", "pa", "gu", "or", "ta", "te", "kn", "ml", "si", "lo", "my", "km", "chr".
-                            region (str): parameter specifies the region to use for Google. Available values: "AF", "AL", "DZ", "AS", "AD", "AO", "AI", "AG", "AR", "AM", "AU", "AT", "AZ", "BS", "BH", "BD", "BY", "BE", "BZ", "BJ", "BT", "BO", "BA", "BW", "BR", "VG", "BN", "BG", "BF", "BI", "KH", "CM", "CA", "CV", "CF", "TD", "CL", "CN", "CO", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "EE", "ET", "FJ", "FI", "FR", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GT", "GG", "GY", "HT", "HN", "HK", "HU", "IS", "IN", "ID", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KW", "KG", "LA", "LV", "LB", "LS", "LY", "LI", "LT", "LU", "MG", "MW", "MY", "MV", "ML", "MT", "MU", "MX", "FM", "MD", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NZ", "NI", "NE", "NG", "NU", "MK", "NO", "OM", "PK", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RO", "RU", "RW", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SK", "SI", "SB", "SO", "ZA", "KR", "ES", "LK", "SH", "VC", "SR", "SE", "CH", "TW", "TJ", "TZ", "TH", "TL", "TG", "TO", "TT", "TN", "TR", "TM", "VI", "UG", "UA", "AE", "GB", "US", "UY", "UZ", "VU", "VE", "VN", "ZM", "ZW".
-                            fields (list): parameter defines which fields you want to include with each item returned in the response. By default, it returns all fields.
-
-                    Returns:
-                            list: json result
-
-            See: https://app.outscraper.com/api-docs#tag/Google-Search/paths/~1google-search-v2/get
-        '''
-        response = requests.get(f'{self._api_url}/google-search-v2', params={
-            'query': as_list(query),
-            'pagesPerQuery': pages_per_query,
-            'uule': uule,
-            'language': language,
-            'region': region,
-            'fields': ','.join(fields) if fields else '',
-        }, headers=self._api_headers)
-
-        if 199 < response.status_code < 300:
-            return self._wait_request_archive(response.json()['id']).get('data', [])
-
-        raise Exception(f'Response status code: {response.status_code}')
-
-    def google_search_v3(self, query: list, pages_per_query: int = 1, uule = '', language: str = 'en', region: str = None, fields: list = None) -> list:
         '''
             Get data from Google search
 
@@ -454,6 +423,9 @@ def google_maps_business_reviews(self, *args, **kwargs) -> list: # deprecated
     def google_maps_reviews_v2(self, *args, **kwargs) -> list: # alias
         return self.google_maps_reviews(*args, **kwargs)
 
+    def google_search_v3(self, *args, **kwargs) -> list: # alias
+        return self.google_search(*args, **kwargs)
+
     def google_play_reviews(self, query: list, reviews_limit: int = 100, sort: str = 'most_relevant', cutoff: int = None,
         rating: int = None, language: str = 'en', fields: list = None
     ) -> list:

setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name='outscraper',
-    version='1.7.2',
+    version='1.8.0',
     description='Python bindings for the Outscraper API',
     long_description=readme(),
     classifiers = ['Programming Language :: Python',