oli-python 1.0.2__tar.gz → 1.2.0__tar.gz

{oli_python-1.0.2 → oli_python-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oli-python
-Version: 1.0.2
+Version: 1.2.0
 Summary: Python SDK for interacting with the Open Labels Initiative; A framework for address labels in the blockchain space. Read & write labels into the OLI Label Pool, check your labels for OLI compliance.
 Home-page: https://github.com/openlabelsinitiative/oli-python
 Author: Lorenz Lehmann

{oli_python-1.0.2 → oli_python-1.2.0}/oli/attestation/offchain.py

@@ -51,6 +51,13 @@ class OffchainAttestations:
         while response.status_code != 200 and retry > 0:
             retry -= 1
             time.sleep(2 ** (n0 - retry)) # exponential backoff
+            # rebuild the attestation (assigns new timestamp) to not get rate limited by EAS post endpoint
+            attestation = self.build_offchain_attestation(
+                recipient=address, 
+                schema=self.oli.oli_label_pool_schema, 
+                data=data, 
+                ref_uid=ref_uid
+            )
             response = self.post_offchain_attestation(attestation)
         
         # if it fails after all retries, raise an error

{oli_python-1.0.2 → oli_python-1.2.0}/oli/attestation/utils_validator.py

@@ -19,7 +19,7 @@ class UtilsValidator:
     def fix_simple_tags_formatting(self, tags: dict) -> dict:
         """
         Fix basic formatting in the tags dictionary. This includes:
-        - Ensuring all tag_ids and their value are lowercase
+        - Ensuring all tag_ids are lowercase
         - Booling values are converted from strings to booleans
         - Removing leading/trailing whitespace from string values
         - Checksum address (string(42)) tags
@@ -33,21 +33,22 @@ class UtilsValidator:
         # Convert tag_ids to lowercase
         tags = {k.lower(): v for k, v in tags.items()}
 
-        # Convert all tag_values to lower case & strip whitespaces, then single boolean values from strings to booleans
+        # Strip whitespaces, then turn boolean values from strings to booleans
         for k, v in tags.items():
             if isinstance(v, str):
-                tags[k] = v.strip().lower()
+                tags[k] = v.strip()
                 if tags[k] == 'true':
                     tags[k] = True
                 elif tags[k] == 'false':
                     tags[k] = False
             elif isinstance(v, list):
-                tags[k] = [i.strip().lower() if isinstance(i, str) else i for i in v]
+                tags[k] = [i.strip() if isinstance(i, str) else i for i in v]
 
-        # Checksum address (string(42)) and transaction hash (string(66)) tags
+        # Checksum address tags
         for k, v in tags.items():
-            if k in self.oli.tag_definitions and self.oli.tag_definitions[k]['type'] == 'string(42)':
-                tags[k] = self.oli.w3.to_checksum_address(v)
+            if k in self.oli.tag_definitions and 'minLength' in self.oli.tag_definitions[k]['schema']:
+                if self.oli.tag_definitions[k]['schema']['minLength'] == 42 and self.oli.tag_definitions[k]['schema']['maxLength'] == 42:
+                    tags[k] = self.oli.w3.to_checksum_address(v)
 
         return tags
 
@@ -138,7 +139,7 @@ class UtilsValidator:
             print(tags)
             raise ValueError("Tags must be a dictionary with OLI compliant tags (e.g., {'contract_name': 'example', 'is_eoa': True})")
         
-        # Check each tag_id in the dictionary
+        # Check each tag_id in the dictionary # TODO: redo this with tag_definitions 2.0 and schema, should be more efficient
         for tag_id in tags.keys():
             
             # Check if the tag_id is in the official OLI tag list
@@ -147,22 +148,36 @@ class UtilsValidator:
             
             # Check if the tag_id is in the correct format. So far implemented [boolean, string, integer, list, float, string(42), string(66), date (YYYY-MM-DD HH:MM:SS)]
             else:
-                if self.oli.tag_definitions[tag_id]['type'] == 'boolean' and not isinstance(tags[tag_id], bool):
+                if self.oli.tag_definitions[tag_id]['schema']['type'] == 'boolean' and not isinstance(tags[tag_id], bool):
                     print(f"WARNING: Tag value for {tag_id} must be a boolean (True/False).")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'string' and not isinstance(tags[tag_id], str):
+                elif self.oli.tag_definitions[tag_id]['schema']['type'] == 'string' and not isinstance(tags[tag_id], str):
                     print(f"WARNING: Tag value for {tag_id} must be a string.")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'integer' and not isinstance(tags[tag_id], int):
+                elif self.oli.tag_definitions[tag_id]['schema']['type'] == 'integer' and not isinstance(tags[tag_id], int):
                     print(f"WARNING: Tag value for {tag_id} must be an integer.")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'float' and not isinstance(tags[tag_id], float):
+                elif self.oli.tag_definitions[tag_id]['schema']['type'] == 'float' and not isinstance(tags[tag_id], float):
                     print(f"WARNING: Tag value for {tag_id} must be a float.")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'list' and not isinstance(tags[tag_id], list):
-                    print(f"WARNING: Tag value for {tag_id} must be a list.")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'string(42)' and not self.oli.w3.is_address(tags[tag_id]):
+                elif self.oli.tag_definitions[tag_id]['schema']['type'] == 'array' and not isinstance(tags[tag_id], list):
+                    print(f"WARNING: Tag value for {tag_id} must be an array.")
+                elif (
+                        self.oli.tag_definitions[tag_id]['schema']['type'] == 'string' and 
+                        self.oli.tag_definitions[tag_id]['schema'].get('minLength') == 42 and 
+                        self.oli.tag_definitions[tag_id]['schema'].get('maxLength') == 42 and 
+                        not self.oli.w3.is_address(tags[tag_id])
+                    ):
                     print(f"WARNING: Tag value for {tag_id} must be a valid Ethereum address string with '0x'.")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'string(66)' and not (len(tags[tag_id]) == 66 and tags[tag_id].startswith('0x')):
+                elif (
+                        self.oli.tag_definitions[tag_id]['schema']['type'] == 'string' and 
+                        self.oli.tag_definitions[tag_id]['schema'].get('minLength') == 66 and 
+                        self.oli.tag_definitions[tag_id]['schema'].get('maxLength') == 66 and 
+                        not (len(tags[tag_id]) == 66 and tags[tag_id].startswith('0x'))
+                    ):
                     print(f"WARNING: Tag value for {tag_id} must be a valid hex string with '0x' prefix and 64 hex characters (66 characters total).")
-                elif self.oli.tag_definitions[tag_id]['type'] == 'date (YYYY-MM-DD HH:MM:SS)' and not isinstance(tags[tag_id], str):
-                    print(f"WARNING: Tag value for {tag_id} must be a string in the format 'YYYY-MM-DD HH:MM:SS'.")
+                elif (
+                        self.oli.tag_definitions[tag_id]['schema']['type'] == 'string' and 
+                        self.oli.tag_definitions[tag_id]['schema'].get('format') == 'date-time' and 
+                        not isinstance(tags[tag_id], str)
+                    ):
+                    print(f"WARNING: Tag value for {tag_id} must be a string in date-time format (e.g., '2023-12-31 23:59:59').")
 
             # Check if the value is in the value set
             if tag_id in self.oli.tag_value_sets:

{oli_python-1.0.2 → oli_python-1.2.0}/oli/core.py

@@ -120,8 +120,8 @@ class OLI:
             return self.offchain.multi_revoke_attestations(uids, gas_limit)
     
     # Expose query methods
-    def graphql_query_attestations(self, address: str=None, attester: str=None, timeCreated: int=None, revocationTime: int=None) -> dict:
-        return self.graphql_client.graphql_query_attestations(address, attester, timeCreated, revocationTime)
+    def graphql_query_attestations(self, address: str=None, attester: str=None, timeCreated: int=None, revocationTime: int=None, take: int=None, id: str=None,expand_json: bool=True) -> dict:
+        return self.graphql_client.graphql_query_attestations(address, attester, timeCreated, revocationTime, take, id, expand_json)
     
     def get_full_raw_export_parquet(self, file_path: str="raw_labels.parquet") -> str:
         return self.data_fetcher.get_full_raw_export_parquet(file_path)

{oli_python-1.0.2 → oli_python-1.2.0}/oli/data/fetcher.py

@@ -36,13 +36,26 @@ class DataFetcher:
         """
         value_sets = {}
 
-        # value sets from self.oli.tag_definitions (must be a list)
-        additional_value_sets = {i['tag_id']: i['value_set'] for i in self.oli.tag_definitions.values() if 'value_set' in i}
-        for tag_id, value_set in additional_value_sets.items():
-            if isinstance(value_set, list):
-                # convert all string values to lowercase and keep the rest as is
-                value_set = [i.lower() if isinstance(i, str) else i for i in value_set]
-                value_sets[tag_id] = value_set
+        # Extract value sets from tag definitions (must be a list)
+        for tag_def in self.oli.tag_definitions.values():
+            if 'schema' not in tag_def:
+                continue
+            
+            schema = tag_def['schema']
+            tag_id = tag_def['tag_id']
+            value_set = None
+            
+            # Get enum from direct schema or array items
+            if 'enum' in schema:
+                value_set = schema['enum']
+            elif (schema.get('type') == 'array' and 
+                'items' in schema and 
+                'enum' in schema['items']):
+                value_set = schema['items']['enum']
+            
+            # Process and add to value_sets
+            if value_set and isinstance(value_set, list):
+                value_sets[tag_id] = [i.lower() if isinstance(i, str) else i for i in value_set]
 
         # value set for owner_project
         url = "https://api.growthepie.xyz/v1/labels/projects.json" 

oli_python-1.2.0/oli/data/graphql.py

@@ -0,0 +1,156 @@
+import requests
+import json
+
+class GraphQLClient:
+    def __init__(self, oli_client):
+        """
+        Initialize the GraphQLClient with an OLI client.
+        
+        Args:
+            oli_client: The OLI client instance
+        """
+        self.oli = oli_client
+    
+    def graphql_query_attestations(self, address: str=None, attester: str=None, timeCreated: int=None, revocationTime: int=None, take: int=None, id: str=None, expand_json: bool=True) -> dict:
+        """
+        Queries attestations from the EAS GraphQL API based on the specified filters.
+        
+        Args:
+            address (str, optional): Ethereum address of the labeled contract
+            attester (str, optional): Ethereum address of the attester
+            timeCreated (int, optional): Filter for attestations created after this timestamp
+            revocationTime (int, optional): Filter for attestations with revocation time >= this timestamp
+            take (int, optional): Maximum number of attestations to return
+            id (str, optional): Specific attestation ID to filter by
+            expand_json (bool, default: True): Whether to expand decodedDataJson fields in the response
+            
+        Returns:
+            dict: JSON response containing matching attestation data
+        """
+        query = """
+            query Attestations($take: Int, $where: AttestationWhereInput, $orderBy: [AttestationOrderByWithRelationInput!]) {
+                attestations(take: $take, where: $where, orderBy: $orderBy) {
+                    attester
+                    decodedDataJson
+                    expirationTime
+                    id
+                    ipfsHash
+                    isOffchain
+                    recipient
+                    refUID
+                    revocable
+                    revocationTime
+                    revoked
+                    time
+                    timeCreated
+                    txid
+                }
+            }
+        """
+            
+        variables = {
+            "where": {
+                "schemaId": {
+                    "equals": self.oli.oli_label_pool_schema
+                }
+            },
+            "orderBy": [
+                {
+                    "timeCreated": "desc"
+                }
+            ]
+        }
+        
+        # Add take to variables if not None
+        if take is not None:
+            variables["take"] = int(take)
+        
+        # Add id to where clause if not None
+        if id is not None:
+            variables["where"]["id"] = {"equals": id}
+        
+        # Add address to where clause if not None
+        if address is not None:
+            variables["where"]["recipient"] = {"equals": address}
+
+        # Add attester to where clause if not None
+        if attester is not None:
+            variables["where"]["attester"] = {"equals": attester}
+        
+        # Add timeCreated to where clause if not None, ensuring it's an int
+        if timeCreated is not None:
+            timeCreated = int(timeCreated)
+            variables["where"]["timeCreated"] = {"gt": timeCreated}
+        
+        # Add revocationTime to where clause if not None, ensuring it's an int
+        if revocationTime is not None:
+            revocationTime = int(revocationTime)
+            variables["where"]["revocationTime"] = {"gte": revocationTime}
+        
+        headers = {
+            "Content-Type": "application/json"
+        }
+        
+        response = requests.post(self.oli.graphql, json={"query": query, "variables": variables}, headers=headers)
+        
+        if response.status_code == 200:
+            if expand_json:
+                # Expand decodedDataJson fields in the response
+                return self.graphql_expand_decoded_data_json(response.json())
+            else:
+                # Return raw response if no expansion is wanted
+                return response.json()
+        else:
+            raise Exception(f"GraphQL query failed with status code {response.status_code}: {response.text}")
+        
+    def graphql_expand_decoded_data_json(self, attestations_data: dict) -> list:
+        """
+        Expand decodedDataJson fields in attestations data into separate columns.
+        
+        Args:
+            attestations_data (dict): GraphQL response from oli.graphql_query_attestations()
+        
+        Returns:
+            list: List of dictionaries with expanded decodedDataJson fields
+        """
+        expanded_data = []
+        
+        for row in attestations_data['data']['attestations']:
+            # Start with the original row data
+            expanded_row = row.copy()
+            
+            # Check if decodedDataJson exists and is not None
+            if 'decodedDataJson' in row and row['decodedDataJson']:
+                try:
+                    # Parse the JSON string
+                    if isinstance(row['decodedDataJson'], str):
+                        decoded_data = json.loads(row['decodedDataJson'])
+                    else:
+                        decoded_data = row['decodedDataJson']
+                    
+                    # Extract each field from the decoded data
+                    for item in decoded_data:
+                        field_name = item['name']
+                        
+                        # Extract the actual value from the nested structure
+                        if 'value' in item and 'value' in item['value']:
+                            value = item['value']['value']
+                            
+                            # Handle BigNumber hex values
+                            if isinstance(value, dict) and value.get('type') == 'BigNumber':
+                                expanded_row[field_name] = int(value['hex'], 16)
+                            # Handle empty arrays or objects
+                            elif isinstance(value, (list, dict)) and not value:
+                                expanded_row[field_name] = value
+                            else:
+                                expanded_row[field_name] = value
+                        else:
+                            expanded_row[field_name] = None
+                            
+                except (json.JSONDecodeError, KeyError, TypeError) as e:
+                    # If parsing fails, keep original row and add error info
+                    expanded_row['_parsing_error'] = str(e)
+            
+            expanded_data.append(expanded_row)
+        
+        return {'data': {'attestations': expanded_data}}

{oli_python-1.0.2 → oli_python-1.2.0}/oli_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oli-python
-Version: 1.0.2
+Version: 1.2.0
 Summary: Python SDK for interacting with the Open Labels Initiative; A framework for address labels in the blockchain space. Read & write labels into the OLI Label Pool, check your labels for OLI compliance.
 Home-page: https://github.com/openlabelsinitiative/oli-python
 Author: Lorenz Lehmann

{oli_python-1.0.2 → oli_python-1.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="oli-python",
-    version="1.0.2",
+    version="1.2.0",
     author="Lorenz Lehmann",
     author_email="lorenz@growthepie.xyz",
     description="Python SDK for interacting with the Open Labels Initiative; A framework for address labels in the blockchain space. Read & write labels into the OLI Label Pool, check your labels for OLI compliance.",

oli_python-1.0.2/oli/data/graphql.py

@@ -1,87 +0,0 @@
-import requests
-
-class GraphQLClient:
-    def __init__(self, oli_client):
-        """
-        Initialize the GraphQLClient with an OLI client.
-        
-        Args:
-            oli_client: The OLI client instance
-        """
-        self.oli = oli_client
-    
-    def graphql_query_attestations(self, address: str=None, attester: str=None, timeCreated: int=None, revocationTime: int=None) -> dict:
-        """
-        Queries attestations from the EAS GraphQL API based on the specified filters.
-        
-        Args:
-            address (str, optional): Ethereum address of the labeled contract
-            attester (str, optional): Ethereum address of the attester
-            timeCreated (int, optional): Filter for attestations created after this timestamp
-            revocationTime (int, optional): Filter for attestations with revocation time >= this timestamp
-            
-        Returns:
-            dict: JSON response containing matching attestation data
-        """
-        query = """
-            query Attestations($take: Int, $where: AttestationWhereInput, $orderBy: [AttestationOrderByWithRelationInput!]) {
-                attestations(take: $take, where: $where, orderBy: $orderBy) {
-                    attester
-                    decodedDataJson
-                    expirationTime
-                    id
-                    ipfsHash
-                    isOffchain
-                    recipient
-                    refUID
-                    revocable
-                    revocationTime
-                    revoked
-                    time
-                    timeCreated
-                    txid
-                }
-            }
-        """
-            
-        variables = {
-            "where": {
-                "schemaId": {
-                    "equals": self.oli.oli_label_pool_schema
-                }
-            },
-            "orderBy": [
-                {
-                "timeCreated": "desc"
-                }
-            ]
-        }
-        
-        # Add address to where clause if not None
-        if address is not None:
-            variables["where"]["recipient"] = {"equals": address}
-
-        # Add attester to where clause if not None
-        if attester is not None:
-            variables["where"]["attester"] = {"equals": attester}
-        
-        # Add timeCreated to where clause if not None, ensuring it's an int
-        if timeCreated is not None:
-            timeCreated = int(timeCreated)
-            variables["where"]["timeCreated"] = {"gt": timeCreated}
-        
-        # Add revocationTime to where clause if not None, ensuring it's an int
-        if revocationTime is not None:
-            revocationTime = int(revocationTime)
-            variables["where"]["revocationTime"] = {"gte": revocationTime}
-        
-        headers = {
-            "Content-Type": "application/json"
-        }
-        
-        response = requests.post(self.oli.graphql, json={"query": query, "variables": variables}, headers=headers)
-        
-        if response.status_code == 200:
-            return response.json()
-        else:
-            raise Exception(f"GraphQL query failed with status code {response.status_code}: {response.text}")