antelope-interface 0.3.3__tar.gz → 0.3.4__tar.gz

{antelope_interface-0.3.3/src/antelope_interface.egg-info → antelope_interface-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: antelope_interface
-Version: 0.3.3
+Version: 0.3.4
 Summary: A common interface for accessing LCA data
 Author-email: Brandon Kuczenski <bkuczenski@ucsb.edu>
 License: BSD-3-Clause
@@ -15,7 +15,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: synonym_dict>=0.2.4
+Requires-Dist: synonym_dict>=0.2.5
 Requires-Dist: pydantic>=2.5.0
 Dynamic: license-file
 

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/pyproject.toml

@@ -21,8 +21,8 @@ classifiers = [
         "Programming Language :: Python :: 3",
         "Topic :: Scientific/Engineering"
 ]
-dependencies = ["synonym_dict >= 0.2.4", "pydantic >= 2.5.0"]
-version = "0.3.3"
+dependencies = ["synonym_dict >= 0.2.5", "pydantic >= 2.5.0"]
+version = "0.3.4"
 
 [tool.setuptools.packages.find]
 where = ["src"]

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/setup.py

@@ -5,6 +5,9 @@ setup()
 
 """
 Version History:
+0.3.4  2026/03/31 - add 'dash' interface type; add 'grant_add' to XDB tokens
+
+0.3.3.1           - sanitize process reference exchange in entity model; cached basic queries
 0.3.3  2025/09/08 - Apply ordering to exchange refs; pandas-friendly output for process refs
 
 0.3.2  2025/08/01 - 0.3.2 release. better background handling.

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/src/antelope/__init__.py

@@ -58,9 +58,10 @@ class BasicQuery(BasicInterface, IndexInterface, ExchangeInterface, QuantityInte
      - archive.source: returns the physical source (or URI) for the archive's content
 
     """
-    def __init__(self, archive, debug=False):
+    def __init__(self, archive, debug=False, cached=True):
         self._archive = archive
         self._dbg = debug
+        self.cached = cached
 
     def _perform_query(self, itype, attrname, exc, *args, **kwargs):
         if itype is None:

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/src/antelope/models/__init__.py

@@ -77,6 +77,9 @@ class Entity(EntityRef):
                   properties=dict())
         for k in entity.signature_fields():
             ent.properties[k] = entity[k]
+        if entity.entity_type == 'process':
+            ent.properties['referenceExchange'] = [ReferenceExchange.from_exchange(x) for x in
+                                                   entity['referenceExchange']]
         return ent
 
     @classmethod

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/src/antelope/models/auth.py

@@ -15,6 +15,7 @@ class AuthModel(BaseModel):
 
 
 JWT_SCOPES = {
+    'das': 'dash',
     'bas': 'basic',
     'ind': 'index',
     'exc': 'exchange',
@@ -29,7 +30,7 @@ class AuthorizationGrant(AuthModel):
     This class stands alone as a list of authorizations granted to users. There is no requirement that the
     users exist in a database
 
-    One natural way to use this is to grant users JWTs as bearer tokensusing an oauth2 system- the bearer token
+    One natural way to use this is to grant users JWTs as bearer tokens using an oauth2 system- the bearer token
     would be created + signed by an auth server, and include the grants embedded in the token.  In the future, this
     token could list specific entities the user has a right to access (e.g. per ecoinvent). The problem is that
     entity UUIDs are 36 characters long- this would become cumbersome if the user had access to
@@ -130,4 +131,11 @@ class AuthorizationGrant(AuthModel):
 
                 grants.append(cls(user=user, issuer=issuer, origin=origin, access=access, values=values, update=update))
 
+        if jwt.add:
+            # grant_add terms show up as access strings in origin-less grants
+            # double-loop, parsing over ' ' then ':' just like above
+            for a in jwt.add.split(' '):
+                for b in a.split(':'):
+                    grants.append(cls(user=user, issuer=issuer, origin='*', access=b))
+
         return grants

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/src/antelope/refs/process_ref.py

@@ -342,11 +342,11 @@ class ProcessRef(EntityRef):
         ref_flow = self._use_ref_exch(ref_flow)
         return self._query.deep_lcia(self.external_ref, lcia_qty, ref_flow=ref_flow, detailed=detailed, **kwargs)
 
-    @property
-    def inventory_as_series(self):
+    def inventory_as_series(self, ref_flow=None):
         """
         Use this as generative input to pandas.Series:
-        s = pandas.Series(process_ref.inventory_as_series)
+        s = pandas.Series(process_ref.inventory_as_series())
+        for processes with multiple references, specify ref_flow as an argument
         :return:
         """
         def _tx_cx(_ex):
@@ -358,19 +358,19 @@ class ProcessRef(EntityRef):
                 return _ex.termination.name
             else:
                 return None
-        return {(k.flow.name, _tx_cx(k), k.direction, k.unit): k.value for k in self.inventory()}
+        return {(k.flow.name, _tx_cx(k), k.direction, k.unit): k.value for k in self.inventory(ref_flow)}
 
-    @property
-    def inventory_as_dataframe(self):
+    def inventory_as_dataframe(self, ref_flow=None):
         """
         Use this as generative input to pandas.DataFrame:
-        df = pandas.DataFrame(process_ref.inventory_as_dataframe)
+        df = pandas.DataFrame(process_ref.inventory_as_dataframe())
+        for processes with multiple references, specify ref_flow as an argument
         :return:
         """
         def _cx_of(_ex):
             if _ex.type == 'context':
                 return _ex.termination.name
             return None
-        for k in self.inventory():
+        for k in self.inventory(ref_flow):
             yield {'Flow': k.flow.name, 'Direction': k.direction, 'Type': k.type, 'Unit': k.flow.unit,
                    'Value': k.value, 'Context': _cx_of(k)}

{antelope_interface-0.3.3 → antelope_interface-0.3.4}/src/antelope/xdb_tokens.py

@@ -39,6 +39,8 @@ class GrantSpec(BaseModel):
     qdb: bool  # whether requests can be forwarded to qdb
     values: bool  # whether numerical data can be requested
     update: bool  # whether user may alter the resource
+    one_time: bool  # whether the grant is revoked after first use
+    grant_add: Optional[str] = None
     has_quota: bool  # whether user's activities are quota constrained (if true, xdb sends a receipt to auth server for every query)
 
     def serialize(self):
@@ -70,6 +72,7 @@ class JwtGrant(BaseModel):
     exp: int  # required
 
     grants: str  # specifies origins and permissions
+    add: Optional[str] = None  # space-separated list of "grant_add" strings
 
     @classmethod
     def from_grants(cls, grants: List[GrantSpec], issuer: str):
@@ -82,6 +85,7 @@ class JwtGrant(BaseModel):
 
         origins = defaultdict(set)
         users = set()
+        add = list()
         qdb = False
         dur = None
         for g in grants:
@@ -93,6 +97,8 @@ class JwtGrant(BaseModel):
                 dur = g.grant_duration
             else:
                 dur = min([dur, g.grant_duration])
+            if g.grant_add:
+                add.append(g.grant_add)
 
         if len(users) != 1:
             raise ValueError('Grants for multiple users received: %s' % users)
@@ -109,7 +115,12 @@ class JwtGrant(BaseModel):
         the_grants = ' '.join(str_grants)
         exp = datetime.now() + timedelta(seconds=dur)
 
-        return cls(iss=issuer, sub=user, exp=int(exp.timestamp()), grants=the_grants)
+        if len(add) > 0:
+            grant_add = ' '.join(add)
+        else:
+            grant_add = None
+
+        return cls(iss=issuer, sub=user, exp=int(exp.timestamp()), grants=the_grants, add=grant_add)
 
 
 class IssuerKey(BaseModel):

{antelope_interface-0.3.3 → antelope_interface-0.3.4/src/antelope_interface.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: antelope_interface
-Version: 0.3.3
+Version: 0.3.4
 Summary: A common interface for accessing LCA data
 Author-email: Brandon Kuczenski <bkuczenski@ucsb.edu>
 License: BSD-3-Clause
@@ -15,7 +15,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: synonym_dict>=0.2.4
+Requires-Dist: synonym_dict>=0.2.5
 Requires-Dist: pydantic>=2.5.0
 Dynamic: license-file
 

antelope_interface-0.3.4/src/antelope_interface.egg-info/requires.txt

@@ -0,0 +1,2 @@
+synonym_dict>=0.2.5
+pydantic>=2.5.0

antelope_interface-0.3.3/src/antelope_interface.egg-info/requires.txt

@@ -1,2 +0,0 @@
-synonym_dict>=0.2.4
-pydantic>=2.5.0