pyspiral 0.6.4__cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.6.5__cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

{pyspiral-0.6.4.dist-info → pyspiral-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyspiral
-Version: 0.6.4
+Version: 0.6.5
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{pyspiral-0.6.4.dist-info → pyspiral-0.6.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pyspiral-0.6.4.dist-info/METADATA,sha256=NHgJTgogXMcDIHbb3I6ONsKdj23IfS2Vwa60m6YgGZo,1842
-pyspiral-0.6.4.dist-info/WHEEL,sha256=sHl2MPySRQtLBS4t9I9tl1bAeFFBhTGABHYdwnegkVM,130
-pyspiral-0.6.4.dist-info/entry_points.txt,sha256=uft7u-a6g40NLt4Q6BleWbK4NY0M8nZuYPpP8DV0EOk,45
+pyspiral-0.6.5.dist-info/METADATA,sha256=3oqXIVdsaDE1PmfUgS5M4zyoSiVWlcS9718MClPjQQw,1842
+pyspiral-0.6.5.dist-info/WHEEL,sha256=sHl2MPySRQtLBS4t9I9tl1bAeFFBhTGABHYdwnegkVM,130
+pyspiral-0.6.5.dist-info/entry_points.txt,sha256=uft7u-a6g40NLt4Q6BleWbK4NY0M8nZuYPpP8DV0EOk,45
 spiral/__init__.py,sha256=5c0faqg-kHZBDwriQ7LzLAMcFolIucp-IA1EzNvCZ3k,711
-spiral/_lib.abi3.so,sha256=oq_VegFDXsy3-ap1Coy5wf_JHD4s6s8PZ8VguB65bmQ,50403064
+spiral/_lib.abi3.so,sha256=XQ5Tfs9s0f7TrMkrc5It8n6C__b_AWLgfCf-cpL5K-s,57866344
 spiral/adbc.py,sha256=7IxfWIeQN-fh0W5OdN_PP2x3pzQYg6ZUOLsHg3jktqw,14842
 spiral/api/__init__.py,sha256=ULBlVq3PnfNOO6T5naE_ULmmii-83--qTuN2PpAUQN0,2241
 spiral/api/admin.py,sha256=A1iVR1XYJSObZivPAD5UzmPuMgupXc9kaHNYYa_kwfs,585
@@ -10,7 +10,7 @@ spiral/api/client.py,sha256=xGc3RKRrerDGGt3QA7Y_friEa-OkZXSQI2Yd1KeFDdw,4668
 spiral/api/filesystems.py,sha256=yEHgHfo7t1_becm0UFedc3nd49_G77hHjYwtYQ6P9XU,4240
 spiral/api/key_space_indexes.py,sha256=-38rZXTdkL4mLhp9h3CtqyIyutzzq88tV6bhK05MqYE,640
 spiral/api/organizations.py,sha256=B-8zZ7lFJANGK7dUNbo_aU-cgI959JBP9VcWb6wdgi0,1895
-spiral/api/projects.py,sha256=62Y1lqI_TpUh3WKQqrjbLWJHiZsI_X3g8u2RTbUwkoA,6162
+spiral/api/projects.py,sha256=1JC7VjqZJfwR6zfhBZr3OCwaf6zb-MXMOBTE_NztmcE,6356
 spiral/api/telemetry.py,sha256=tfdA3E_EWJwFVxkQfkm8tiYGRubnx2LuE5nbfsk1oG4,474
 spiral/api/text_indexes.py,sha256=_zVlGBytl-9-Unbu2POfZgLh40H1YRcagFtplgIG428,1828
 spiral/api/types.py,sha256=lGdiKViRgIEJXD2ubwnyEIEwHkfRumlZjVEaHMV3Tm8,682
@@ -25,21 +25,21 @@ spiral/cli/console.py,sha256=6JHbAQV6MFWz3P-VzqPOjhHpkIQagsCdzTMvmuDKMkU,2580
 spiral/cli/fs.py,sha256=vaPcSc2YghhHeipxNitIdsHaBhFwlwkvPFqYsFSN9P0,2927
 spiral/cli/iceberg.py,sha256=Q14tcGcn1LixbFCYP0GhfYwFFXTmmi8tqBPYwalJEyE,3248
 spiral/cli/key_spaces.py,sha256=x3IFRP5d47pKiAHeWExYMOBaT2TwxbWjVM01SUqKrwI,2943
-spiral/cli/login.py,sha256=iyWQR2n2cOcg2-6NMaD2uCSQfvsoz7wMeyT9s7h80Fc,698
+spiral/cli/login.py,sha256=2tw6uN5rEpiMMAmjQSB3-JUPf3C0Wc1eTGCDxhYtJps,731
 spiral/cli/orgs.py,sha256=fmOuLxpeIFfKqePRi292Gv9k-EF5pPn_tbKd2BLl2Ig,2869
 spiral/cli/printer.py,sha256=HcvSUpaMItzmhBUfIHROK1Z3SL8J8wDopS3Qo8H00uw,1781
-spiral/cli/projects.py,sha256=UYrBlLcFacuXExdLX1sZByfvkz9MRtk_0oRAZvqHa0w,5105
+spiral/cli/projects.py,sha256=1M1nGrBT-t0aY9RV5Cnmzy7YrhIvmHwdkpa3y9j8rG8,5756
 spiral/cli/state.py,sha256=10wTIVQ0SJkY67Z6-KQ1LFlt3aVIPmZhoHFdTwp4kNA,130
 spiral/cli/tables.py,sha256=48lZ0wPQSCTul1vn-Qx6Be5eGnw75Abtw2zxMK9dCPg,4613
 spiral/cli/telemetry.py,sha256=Uxo1Q1FkKJ6n6QNGOUmL3j_pRRWRx0qWIhoP-U9BuR0,589
 spiral/cli/text.py,sha256=DlWGe4JrkdERAiqyITNpk91Wqb63Re99rNYlIFsIamc,4031
 spiral/cli/types.py,sha256=XYzo1GgX7dBBItoBSrHI4vO5C2lLmS2sktb-2GnGH3E,1362
 spiral/cli/workloads.py,sha256=2_SLfQTFN6y73R9H0i9dk8VIOVagKxSxOpHXC56yptY,2015
-spiral/client.py,sha256=Po9xgCH3NwVsCeRZMm3eJUPV77Rknyj-9MfCS1TbdTg,6623
+spiral/client.py,sha256=ANKzL6yQ-7X4Livq4xCZsWVdQSU3j1J7gSJv6dzeaJs,6630
 spiral/core/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/core/_tools/__init__.pyi,sha256=b2KLfTOQ67pjfbYt07o0IGiTu5o2bZw69lllV8v0Dps,143
-spiral/core/authn/__init__.pyi,sha256=Jw_8ywTMDTwgAtGxMtFED63rU0jOgrv-eZtaZ5sR5t4,757
-spiral/core/client/__init__.pyi,sha256=6D4eu78eHW9Zl5Fx3UIRbk9ywvlZJephal56H1LDjko,6095
+spiral/core/authn/__init__.pyi,sha256=z_GWyIS62fuiYQrYO8hzw4W8oGaiciqS1u5qtAt54VY,769
+spiral/core/client/__init__.pyi,sha256=wEZi15Hf7Jg-Qo1N-k97ss1YqwSQehuoZVqPxj_4EvA,6126
 spiral/core/table/__init__.pyi,sha256=ajxO2N92hTQ4evsl7QBWB8ivz-cDNxXnAv0jytRw0ZY,3183
 spiral/core/table/manifests/__init__.pyi,sha256=eVfDpmhYSjafIvvALqAkZe5baN3Y1HpKpxYEbjwd4gQ,1043
 spiral/core/table/metastore/__init__.pyi,sha256=rc3u9MwEKRvL2kxOc8lBorddFRnM8o_o1frqtae86a4,1697
@@ -81,21 +81,21 @@ spiral/protogen/_/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/protogen/_/scandal/__init__.py,sha256=liUQAICLd2sPccCmqo0_c1duSbNj_m8p_IgmdnHsB3E,4965
 spiral/protogen/_/spfs/__init__.py,sha256=zMMEDIfPXQNBkisLI-iMWbJABye-vK42Gf2BUQQYR_c,2028
 spiral/protogen/_/spql/__init__.py,sha256=PEC4bI-PHdJ4Zd8Jb1k6Xk2iFYoYqIUbTGlL2JVGnT0,1548
-spiral/protogen/_/substrait/__init__.py,sha256=eVv-5CRJv8KstANM-_U3WzCVmkmZ8_BTOFP-1f2sSX4,209839
+spiral/protogen/_/substrait/__init__.py,sha256=-ngqHcYfio6s1B4M1_e1VsDymUcFK9qdM17ECA31qLw,209837
 spiral/protogen/_/substrait/extensions/__init__.py,sha256=nhnEnho70GAT8WPj2xtwJUzk5GJ6X2e-HTvyk7emGsk,5326
 spiral/protogen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/protogen/util.py,sha256=smnvVo6nYH3FfDm9jqhNLaXz4bbTBaQezHQDCTvZyiQ,1486
 spiral/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/scan.py,sha256=SCDZ9UXA4g0Jq9BQ9Zt7cEK2NBq64Hqh_SttR4tF6jo,6252
 spiral/server.py,sha256=ztBmB5lBnUz-smQxR_tC8AI5SOhz17wH0MI3GuzDUdM,600
-spiral/settings.py,sha256=cLD1MSyzIM1CRRB2ncYB9u849cxGAqYlycvNExU6TGo,3096
+spiral/settings.py,sha256=JRQSwjJyNaCqQdQLxiqB_O_LZRQXMLyshJBrI2LZHwM,3113
 spiral/snapshot.py,sha256=tYEIKYYqS9Eusb8rsrG46VD7fiNPA9yVOR5ajMMtT_g,2018
 spiral/streaming_/__init__.py,sha256=s7MlW2ERsuZmZGExLFL6RcZon2e0tNBocBg5ANgki7k,61
 spiral/streaming_/reader.py,sha256=Kpqknv2jn12jUhHOEEDArj0JZwrWb8XjoOGs9HrdVyA,4047
 spiral/streaming_/stream.py,sha256=-prGp73h0XDsdKW0mAEamy4AXhd1oF5fBbNbbY1k2-A,5931
 spiral/substrait_.py,sha256=AKeOD4KIXvz2J4TYxnIneOiHddtBIyOhuNxVO_uH0eg,12592
-spiral/table.py,sha256=ru1G7CXZGD-k4sg621qe-IEAU9kU1WujZ32AXAmdvx4,8861
+spiral/table.py,sha256=iWoWm0XAcmW99NQXgEsdDWvq1Z9tUSd6t0kn4o1WmSo,9019
 spiral/text_index.py,sha256=FQ9rgIEGLSJryS9lFdMhKtPFey18BXoWbPXyvZPJJ04,442
-spiral/transaction.py,sha256=nSykH4UGs9hGtWuSWK9YyT9jfEuvzfkKoUgMM5Xt4zU,1841
+spiral/transaction.py,sha256=rjoOQc9bvs1zAAhb8cLtJOOn2146UAMZjcSVcEXeNFY,1839
 spiral/types_.py,sha256=W_jyO7F6rpPiH69jhgSgV7OxQZbOlb1Ho3InpKUP6Eo,155
-pyspiral-0.6.4.dist-info/RECORD,,
+pyspiral-0.6.5.dist-info/RECORD,,

spiral/api/projects.py

@@ -99,19 +99,26 @@ class ModalPrincipalConditions(BaseModel):
     conditions: ModalConditions | None = None
 
 
-class GCPPrincipalConditions(BaseModel):
+class GcpServiceAccountPrincipalConditions(BaseModel):
     type: Literal["gcp"] = "gcp"
     service_account: str
     unique_id: str
 
 
+class AwsAssumedRolePrincipalConditions(BaseModel):
+    type: Literal["aws"] = "aws"
+    account_id: str
+    role_name: str
+
+
 PrincipalConditions = Annotated[
     OrgRolePrincipalConditions
     | OrgUserPrincipalConditions
     | WorkloadPrincipalConditions
     | GitHubPrincipalConditions
     | ModalPrincipalConditions
-    | GCPPrincipalConditions,
+    | GcpServiceAccountPrincipalConditions
+    | AwsAssumedRolePrincipalConditions,
     Field(discriminator="type"),
 ]
 

spiral/cli/login.py

@@ -13,7 +13,9 @@ def command(org_id: str | None = None, force: bool = False, show_token: bool = F
 def whoami():
     """Display the current user's information."""
     payload = jwt.decode(state.settings.authn.token().expose_secret(), options={"verify_signature": False})
-    CONSOLE.print(f"{payload['org_id']}")
+
+    if "org_id" in payload:
+        CONSOLE.print(f"{payload['org_id']}")
     CONSOLE.print(f"{payload['sub']}")
 
 

spiral/cli/projects.py

@@ -1,12 +1,13 @@
-from typing import Annotated
+from typing import Annotated, Literal
 
 import typer
 from typer import Option
 
 from spiral.api.organizations import OrgRole
 from spiral.api.projects import (
+    AwsAssumedRolePrincipalConditions,
     CreateProjectRequest,
-    GCPPrincipalConditions,
+    GcpServiceAccountPrincipalConditions,
     GitHubConditions,
     GitHubPrincipalConditions,
     Grant,
@@ -41,40 +42,47 @@ def create(
     CONSOLE.print(f"Created project {res.project.id}")
 
 
-@app.command(help="Grant a role on a project.")
+@app.command(help="Grant a role on a project to a principal.")
 def grant(
     project: ProjectArg,
-    role: Annotated[str, Option(help="Role to grant.")],
+    role: Annotated[Literal["viewer", "editor", "admin"], Option(help="Project role to grant.")],
     org_id: Annotated[
         str | None, Option(help="Pass an organization ID to grant a role to an organization user(s).")
     ] = None,
-    user_id: Annotated[
+    org_user: Annotated[
         str | None, Option(help="Pass a user ID when using --org-id to grant a role to grant a role to a user.")
     ] = None,
     org_role: Annotated[
-        str | None,
-        Option(help="Pass an organization role when using --org-id to grant a role to all users with that role."),
+        Literal["owner", "member", "guest"] | None,
+        Option(help="Pass an org role when using --org-id to grant a role to all users with that role."),
     ] = None,
     workload_id: Annotated[str | None, Option(help="Pass a workload ID to grant a role to a workload.")] = None,
     github: Annotated[
-        str | None, Option(help="Pass an `<org>/<repo>` string to grant a role to a job running in GitHub Actions.")
+        str | None, Option(help="Pass an `{org}/{repo}` string to grant a role to a job running in GitHub Actions.")
     ] = None,
     modal: Annotated[
         str | None,
-        Option(help="Pass a `<workspace_id>/<env_name>` string to grant a role to a job running in Modal environment."),
+        Option(help="Pass a `{workspace_id}/{env_name}` string to grant a role to a job running in Modal environment."),
+    ] = None,
+    gcp_service_account: Annotated[
+        str | None,
+        Option(help="Pass a `{service_account_email}/{unique_id}` to grant a role to a GCP service account."),
     ] = None,
-    gcp: Annotated[
+    aws_iam_role: Annotated[
         str | None,
-        Option(help="Pass a `<service_account_email>/<unique_id>` to grant a role to a GCP service account."),
+        Option(help="Pass a `{account_id}/{role_name}` to grant a Spiral role to an AWS IAM Role."),
     ] = None,
     conditions: list[str] | None = Option(
         default=None,
-        help="`<key>=<value>` token conditions to apply to the grant when using --github or --modal.",
+        help="`{key}={value}` token conditions to apply to the grant",
     ),
 ):
     # Check mutual exclusion
-    if sum(int(bool(opt)) for opt in {org_id, workload_id, github, modal, gcp}) != 1:
-        raise typer.BadParameter("Only one of --org-id, --github or --modal may be specified.")
+    if sum(int(bool(opt)) for opt in {org_id, workload_id, github, modal, gcp_service_account, aws_iam_role}) != 1:
+        raise typer.BadParameter(
+            "Only one of [--org-id, --workload-id, --github, --modal, --gcp-service-account, --aws-iam-role] "
+            "may be specified."
+        )
 
     if github:
         org, repo = github.split("/", 1)
@@ -98,22 +106,26 @@ def grant(
 
     elif org_id:
         # Check mutual exclusion
-        if sum(int(bool(opt)) for opt in {user_id, org_role}) != 1:
-            raise typer.BadParameter("Only one of --user-id or --org-role may be specified.")
+        if sum(int(bool(opt)) for opt in {org_user, org_role}) != 1:
+            raise typer.BadParameter("Only one of --org-user or --org-role may be specified.")
 
-        if user_id is not None:
-            principal = OrgUserPrincipalConditions(org_id=org_id, user_id=user_id)
+        if org_user is not None:
+            principal = OrgUserPrincipalConditions(org_id=org_id, user_id=org_user)
         elif org_role is not None:
             principal = OrgRolePrincipalConditions(org_id=org_id, role=OrgRole(org_role))
         else:
-            raise NotImplementedError("Only user or role principal is supported at this time.")
+            raise typer.BadParameter("One of --org-user or --org-role must be specified with --org-id.")
 
     elif workload_id:
         principal = WorkloadPrincipalConditions(workload_id=workload_id)
 
-    elif gcp:
-        service_account, unique_id = gcp.split("/", 1)
-        principal = GCPPrincipalConditions(service_account=service_account, unique_id=unique_id)
+    elif gcp_service_account:
+        service_account, unique_id = gcp_service_account.split("/", 1)
+        principal = GcpServiceAccountPrincipalConditions(service_account=service_account, unique_id=unique_id)
+
+    elif aws_iam_role:
+        account_id, role_name = aws_iam_role.split("/", 1)
+        principal = AwsAssumedRolePrincipalConditions(account_id=account_id, role_name=role_name)
 
     else:
         raise ValueError("Invalid grant principal")

spiral/client.py

@@ -98,7 +98,7 @@ class Spiral:
         *projections: ExprLike,
         where: ExprLike | None = None,
         asof: datetime | int | None = None,
-        exclude_keys: bool = False,
+        exclude_keys: bool | None = None,
     ) -> Scan:
         """Starts a read transaction on the Spiral.
 
@@ -136,7 +136,7 @@ class Spiral:
         filters: ExprLike | None = None,
         freshness_window: timedelta | None = None,
     ) -> pa.RecordBatchReader:
-        """Queries the index with the given rank by and filters clauses. Returns a steam of scored keys.
+        """Queries the index with the given rank by and filters clauses. Returns a stream of scored keys.
 
         Args:
             top_k: The number of top results to return.

spiral/core/authn/__init__.pyi

@@ -8,7 +8,7 @@ class Authn:
     @staticmethod
     def from_token(token: Token) -> Authn: ...
     @staticmethod
-    def from_fallback() -> Authn: ...
+    def from_fallback(api_url: str) -> Authn: ...
     @staticmethod
     def from_device() -> Authn: ...
     def token(self) -> Token | None: ...

spiral/core/client/__init__.pyi

@@ -26,12 +26,12 @@ class Spiral:
         projection: Expr,
         filter: Expr | None = None,
         asof: int | None = None,
-        exclude_keys: bool = False,
+        exclude_keys: bool | None = None,
     ) -> Scan:
         """Construct a table scan."""
         ...
 
-    def transaction(self, table: Table, format: str | None = None) -> Transaction:
+    def transaction(self, table: Table, format: str | None = None, retries: int | None = 3) -> Transaction:
         """Being a table transaction."""
         ...
 

spiral/protogen/_/substrait/__init__.py

@@ -2885,7 +2885,7 @@ class ExpressionMaskExpression(betterproto2.Message):
     """
     A reference that takes an existing subtype and selectively removes fields
     from it. For example, one might initially have an inner struct with 100
-    fields but a a particular operation only needs to interact with only 2 of
+    fields but a particular operation only needs to interact with only 2 of
     those 100 fields. In this situation, one would use a mask expression to
     eliminate the 98 fields that are not relevant to the rest of the operation
     pipeline.

spiral/settings.py

@@ -91,7 +91,7 @@ class Settings(BaseSettings):
     def authn(self):
         if self.spiraldb.token:
             return Authn.from_token(self.spiraldb.token)
-        return Authn.from_fallback()
+        return Authn.from_fallback(self.spiraldb.uri)
 
     @functools.cached_property
     def device_code_auth(self) -> DeviceCodeAuth:

spiral/table.py

@@ -116,7 +116,7 @@ class Table(Expr):
 
 
         :param column_paths: Fully qualified column names. (e.g., "column_name" or "nested.field").
-            All columns must exist, if a a column doesn't exist the function will return an error.
+            All columns must exist, if a column doesn't exist the function will return an error.
         """
         with self.txn() as txn:
             txn.drop_columns(column_paths)
@@ -127,14 +127,16 @@ class Table(Expr):
             asof = int(asof.timestamp() * 1_000_000)
         return Snapshot(self, self.core.get_snapshot(asof=asof))
 
-    def txn(self) -> Transaction:
+    def txn(self, retries: int | None = 3) -> Transaction:
         """Begins a new transaction. Transaction must be committed for writes to become visible.
 
+        :param retries: Maximum number of retry attempts on conflict (default: 3). Set to None for a single attempt.
+
         IMPORTANT: While transaction can be used to atomically write data to the table,
              it is important that the primary key columns are unique within the transaction.
              The behavior is undefined if this is not the case.
         """
-        return Transaction(self.spiral._core.transaction(self.core, settings().file_format))
+        return Transaction(self.spiral._core.transaction(self.core, settings().file_format, retries=retries))
 
     def to_dataset(self) -> "ds.Dataset":
         """Returns a PyArrow Dataset representing the table."""

spiral/transaction.py

@@ -45,7 +45,7 @@ class Transaction:
 
 
         :param column_paths: Fully qualified column names. (e.g., "column_name" or "nested.field").
-            All columns must exist, if a a column doesn't exist the function will return an error.
+            All columns must exist, if a column doesn't exist the function will return an error.
         """
         self._core.drop_columns(column_paths)