api change

Author: pim97

scrappeycom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrappeycom
-Version: 0.3.3
+Version: 0.3.4
 Summary: An API wrapper for Scrappey.com written in Python (cloudflare bypass & solver)
 Home-page: https://github.com/pim97/scrappey-wrapper-python
 Download-URL: https://github.com/pim97/scrappey-wrapper-python/releases/tag/v_03

scrappeycom.egg-info/requires.txt

@@ -1,2 +1 @@
 requests
-urllib

scrappeycom/scrappey.py

@@ -6,7 +6,7 @@ def __init__(self, api_key):
         self.api_key = api_key
         self.base_url = 'https://publisher.scrappey.com/api/v1'
 
-    def send_request(self, endpoint, method, data=None):
+    def send_request(self, endpoint, data=None):
         url = f'{self.base_url}?key={self.api_key}'
 
         headers = {
@@ -19,39 +19,25 @@ def send_request(self, endpoint, method, data=None):
         }
 
         try:
-            response = requests.request(method, url, headers=headers, json=payload)
+            response = requests.post(url, headers=headers, json=payload)
             response.raise_for_status()
             return response.json()
         except requests.exceptions.RequestException as error:
             raise error
 
-    def create_session(self, session_id=None, proxy=None):
-        return self.send_request('sessions.create', 'POST', {'session': session_id, 'proxy': proxy})
+    def create_session(self, data):
+        return self.send_request(endpoint='sessions.create', data=data)
 
-    def destroy_session(self, session_id):
-        if session_id is None:
-            raise ValueError('sessionId parameter is required.')
+    def destroy_session(self, session):
+        if session is None:
+            raise ValueError('session parameter is required.')
+        return self.send_request(endpoint='sessions.destroy', data={'session': session})
 
-        return self.send_request('sessions.destroy', 'POST', {'session': session_id})
+    def request(self, data):
+        if data is None:
+            raise ValueError('data parameter is required.')
+        
+        if data['cmd'] is None:
+            raise ValueError('data.cmd parameter is required.')
 
-    def get_request(self, url, session_id=None, cookiejar=None, proxy=None):
-        if url is None:
-            raise ValueError('url parameter is required.')
-
-        if session_id is None and cookiejar is None and proxy is None:
-            raise ValueError('At least one of sessionId, cookiejar, or proxy parameters must be provided.')
-
-        return self.send_request('request.get', 'POST', {'url': url, 'session': session_id, 'cookiejar': cookiejar, 'proxy': proxy})
-
-    def post_request(self, url, post_data, session_id=None, cookiejar=None, proxy=None):
-        is_form_data = isinstance(post_data, str) and '=' in post_data
-
-        if not is_form_data:
-            try:
-                request_data = urllib.parse.urlencode(post_data)
-            except ValueError:
-                raise ValueError('Invalid postData format. It must be in application/x-www-form-urlencoded format.')
-        else:
-            request_data = post_data
-
-        return self.send_request('request.post', 'POST', {'url': url, 'postData': request_data, 'session': session_id, 'cookiejar': cookiejar, 'proxy': proxy})
+        return self.send_request(endpoint=data['cmd'], data=data)

scrappeycom/test.py

@@ -1,21 +1,53 @@
 from scrappey import Scrappey
+import uuid
 
-scrappey = Scrappey('YOUR_API_KEY')
+scrappey = Scrappey('API_KEY')
 
 def run_test():
     try:
-        session = scrappey.create_session()
-        print(session)
+        sessionData = {
+            'session': str(uuid.uuid4()), #uuid is also optional, otherwise default uuid will be used
+            #'proxy': 'http://username:password@ip:port' #proxy is optional, otherwise default proxy will be used
+        }
+        session = scrappey.create_session(sessionData)
+        print('Session created:', session['session'])
 
-        get_request_result = scrappey.get_request('https://httpbin.rs/get', session['session'])
+        # View all the options here with the request builder
+        # https://app.scrappey.com/#/builder
+        # Just copy paste it below, example
+        #
+        #    {
+        #       "cmd":  "request.get",
+        #       "url":  "https://httpbin.rs/get"
+        #    }
+
+        get_request_result = scrappey.request({
+            "cmd":  "request.get",
+            'session': session['session'],
+            'url': 'https://httpbin.rs/get',
+        })
         print('GET Request Result:', get_request_result)
 
-        post_data = {'username': 'user123', 'password': 'pass456'}
-        post_request_result = scrappey.post_request('https://httpbin.rs/post', post_data, session['session'])
+        post_request_result = scrappey.request({
+            "cmd": "request.post",
+            "url": "https://httpbin.rs/post",
+            "postData": "test=test&test2=test2"
+        })
         print('POST Request Result:', post_request_result)
 
-        scrappey.destroy_session(session['session'])
-        print('Session destroyed.')
+        # JSON request example
+        post_request_result_json = scrappey.request({
+            "cmd": "request.post",
+            "url": "https://backend.scrappey.com/api/auth/login",
+            "postData": "{\"email\":\"email\",\"password\":\"password\"}",
+            "customHeaders": {
+                "content-type": "application/json"
+            }
+        })
+        print('POST Request Result:', post_request_result_json)
+
+        sessionDestroyed = scrappey.destroy_session(sessionData)
+        print('Session destroyed:', sessionDestroyed)
     except Exception as error:
         print(error)
 

setup.py

@@ -6,7 +6,7 @@
 setup(
   name = 'scrappeycom',         # How you named your package folder (MyLib)
   packages = ['scrappeycom'],   # Chose the same as "name"
-  version = '0.3.3',      # Start with a small number and increase it with every change you make
+  version = '0.3.5',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'An API wrapper for Scrappey.com written in Python (cloudflare bypass & solver)',   # Give a short description about your library
   author = 'dormic97',                   # Type in your name
@@ -17,8 +17,7 @@
   long_description=long_description,
   long_description_content_type='text/markdown',
   install_requires=[            # I get to this in a second
-          'requests',
-          'urllib'
+          'requests'
       ],
   classifiers=[
     'Development Status :: 5 - Production/Stable',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package