sfq 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

sfq/__init__.py

@@ -1,6 +1,7 @@
 import http.client
 import logging
 import time
+import os
 import json
 from urllib.parse import urlparse, quote
 
@@ -17,6 +18,7 @@ class SFAuth:
         access_token=None,
         token_expiration_time=None,
         token_lifetime=15 * 60,
+        proxy="auto",
     ):
         """
         Initializes the SFAuth with necessary parameters.
@@ -29,6 +31,7 @@ class SFAuth:
         :param access_token: The access token for the current session (default is None).
         :param token_expiration_time: The expiration time of the access token (default is None).
         :param token_lifetime: The lifetime of the access token (default is 15 minutes).
+        :param proxy: The proxy configuration (default is "auto").
         """
         self.instance_url = instance_url
         self.client_id = client_id
@@ -38,6 +41,19 @@ class SFAuth:
         self.access_token = access_token
         self.token_expiration_time = token_expiration_time
         self.token_lifetime = token_lifetime
+        self._auto_configure_proxy(proxy)
+
+    def _auto_configure_proxy(self, proxy):
+        """
+        Automatically configure the proxy based on the environment.
+        """
+        if proxy == "auto":
+            if "https_proxy" in os.environ:
+                self.proxy = os.environ["https_proxy"]
+            else:
+                self.proxy = None
+        else:
+            self.proxy = proxy
 
     def _prepare_payload(self):
         """Prepare the payload for the token request."""
@@ -47,13 +63,28 @@ class SFAuth:
             "refresh_token": self.refresh_token,
         }
 
+    def _create_connection(self, netloc):
+        """
+        Create a connection using HTTP or HTTPS, depending on the proxy configuration.
+        """
+        if self.proxy:
+            proxy_url = urlparse(self.proxy)
+            if proxy_url.scheme == "http://":
+                conn = http.client.HTTPConnection(proxy_url.hostname, proxy_url.port)
+            else:
+                conn = http.client.HTTPSConnection(proxy_url.hostname, proxy_url.port)
+            conn.set_tunnel(netloc)
+        else:
+            conn = http.client.HTTPSConnection(netloc)
+        return conn
+
     def _send_post_request(self, payload):
         """Send a POST request to the Salesforce token endpoint using http.client."""
         parsed_url = urlparse(self.instance_url)
-        conn = http.client.HTTPSConnection(parsed_url.netloc)
+        conn = self._create_connection(parsed_url.netloc)
 
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
-        body = "&".join([f"{key}={value}" for key, value in payload.items()])
+        body = "&".join([f"{key}={quote(str(value))}" for key, value in payload.items()])
 
         try:
             conn.request("POST", self.token_endpoint, body, headers)
@@ -75,7 +106,7 @@ class SFAuth:
 
     def _refresh_token_if_needed(self):
         """Automatically refresh the token if it has expired or is missing."""
-        _token_expiration = self._is_token_expired
+        _token_expiration = self._is_token_expired()
         if self.access_token and not _token_expiration:
             return
         
@@ -96,7 +127,10 @@ class SFAuth:
 
     def _is_token_expired(self):
         """Check if the access token has expired."""
-        return time.time() >= self.token_expiration_time
+        try:
+            return time.time() >= float(self.token_expiration_time)
+        except (TypeError, ValueError):
+            return False
 
     def query(self, query, tooling=False):
         """Query Salesforce using SOQL or Tooling API, depending on the `tooling` parameter."""
@@ -118,7 +152,7 @@ class SFAuth:
         params = f"?q={encoded_query}"
 
         parsed_url = urlparse(self.instance_url)
-        conn = http.client.HTTPSConnection(parsed_url.netloc)
+        conn = self._create_connection(parsed_url.netloc)
 
         try:
             conn.request("GET", query_endpoint + params, headers=headers)

{sfq-0.0.1.dist-info → sfq-0.0.3.dist-info}/METADATA

@@ -1,15 +1,17 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: sfq
-Version: 0.0.1
+Version: 0.0.3
 Summary: Python wrapper for the Salesforce's Query API.
 Author-email: David Moruzzi <sfq.pypi@dmoruzi.com>
 Keywords: salesforce,salesforce query
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.12
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 # sfq (Salesforce Query)

sfq-0.0.3.dist-info/RECORD

@@ -0,0 +1,5 @@
+sfq/__init__.py,sha256=vcAXd4v6uyjzAqOril31LG2WG2n3l6OHxPiYQA63uD4,6361
+sfq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sfq-0.0.3.dist-info/METADATA,sha256=y5Ir5XtomFESBbaktjuWzsA2d0Q40qlMIBXx1igISU4,4685
+sfq-0.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sfq-0.0.3.dist-info/RECORD,,

{sfq-0.0.1.dist-info → sfq-0.0.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

sfq-0.0.1.dist-info/RECORD

@@ -1,5 +0,0 @@
-sfq/__init__.py,sha256=pOOF_qbF_5lWmZCp7Zth_cllmqD9Svr3pOVu01-1h5w,5180
-sfq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sfq-0.0.1.dist-info/METADATA,sha256=tDxHUnStTdh2UrOqI9ItvquS3BHSVANmdhuF2-Sshlo,4585
-sfq-0.0.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sfq-0.0.1.dist-info/RECORD,,