foundry-dev-tools 2.1.6__tar.gz → 2.1.8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (77) hide show
  1. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/PKG-INFO +3 -3
  2. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/pyproject.toml +1 -1
  3. foundry_dev_tools-2.1.8/src/foundry_dev_tools/__about__.py +1 -0
  4. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/resources/dataset.py +49 -34
  5. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/resources/resource.py +2 -0
  6. foundry_dev_tools-2.1.6/src/foundry_dev_tools/__about__.py +0 -1
  7. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/README.md +0 -0
  8. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/__init__.py +0 -0
  9. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/_optional/__init__.py +0 -0
  10. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/_optional/pandas.py +0 -0
  11. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/_optional/polars.py +0 -0
  12. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
  13. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
  14. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cached_foundry_client.py +0 -0
  15. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/__init__.py +0 -0
  16. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/build.py +0 -0
  17. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/config.py +0 -0
  18. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/git.py +0 -0
  19. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
  20. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/info.py +0 -0
  21. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/main.py +0 -0
  22. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/s3.py +0 -0
  23. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/cli/stubs.py +0 -0
  24. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/__init__.py +0 -0
  25. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/api_client.py +0 -0
  26. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/build2.py +0 -0
  27. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/catalog.py +0 -0
  28. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/compass.py +0 -0
  29. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/context_client.py +0 -0
  30. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
  31. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
  32. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
  33. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/jemma.py +0 -0
  34. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/metadata.py +0 -0
  35. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/multipass.py +0 -0
  36. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
  37. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/s3_client.py +0 -0
  38. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
  39. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/config/__init__.py +0 -0
  40. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/config/config.py +0 -0
  41. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/config/config_types.py +0 -0
  42. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/config/context.py +0 -0
  43. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/config/token_provider.py +0 -0
  44. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/__init__.py +0 -0
  45. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/compass.py +0 -0
  46. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/config.py +0 -0
  47. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/dataset.py +0 -0
  48. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/handling.py +0 -0
  49. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/meta.py +0 -0
  50. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/multipass.py +0 -0
  51. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/errors/sql.py +0 -0
  52. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/foundry_api_client.py +0 -0
  53. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/helpers/__init__.py +0 -0
  54. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/helpers/multipass/__init__.py +0 -0
  55. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/helpers/multipass/group.py +0 -0
  56. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/helpers/multipass/principal.py +0 -0
  57. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/helpers/multipass/user.py +0 -0
  58. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/py.typed +0 -0
  59. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/resources/__init__.py +0 -0
  60. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/resources/folder.py +0 -0
  61. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/__init__.py +0 -0
  62. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/api_types.py +0 -0
  63. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/async_s3.py +0 -0
  64. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
  65. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
  66. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
  67. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/cli.py +0 -0
  68. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/clients.py +0 -0
  69. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/compat.py +0 -0
  70. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/config.py +0 -0
  71. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
  72. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
  73. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/misc.py +0 -0
  74. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
  75. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/repo.py +0 -0
  76. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/s3.py +0 -0
  77. {foundry_dev_tools-2.1.6 → foundry_dev_tools-2.1.8}/src/foundry_dev_tools/utils/spark.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: foundry-dev-tools
3
- Version: 2.1.6
3
+ Version: 2.1.8
4
4
  Summary: Seamlessly run your Palantir Foundry Repository transforms code on your local machine.
5
5
  Author-Email: Nicolas Renkamp <nicolas.renkamp@merckgroup.com>, Jonas Wunderlich <jonas.wunderlich@merckgroup.com>
6
6
  License: Apache-2.0
@@ -33,11 +33,11 @@ Requires-Dist: websockets
33
33
  Requires-Dist: rich
34
34
  Requires-Dist: packaging
35
35
  Requires-Dist: tomli_w
36
+ Provides-Extra: s3
36
37
  Requires-Dist: aiobotocore[boto3]; extra == "s3"
38
+ Provides-Extra: full
37
39
  Requires-Dist: foundry-dev-tools-transforms; extra == "full"
38
40
  Requires-Dist: foundry-dev-tools[s3]; extra == "full"
39
- Provides-Extra: s3
40
- Provides-Extra: full
41
41
  Description-Content-Type: text/markdown
42
42
 
43
43
  <div align="center">
@@ -41,7 +41,7 @@ dependencies = [
41
41
  "tomli_w",
42
42
  ]
43
43
  dynamic = []
44
- version = "2.1.6"
44
+ version = "2.1.8"
45
45
 
46
46
  [project.license]
47
47
  text = "Apache-2.0"
@@ -0,0 +1 @@
1
+ __version__ = '2.1.8'
@@ -41,7 +41,7 @@ if TYPE_CHECKING:
41
41
  class Dataset(resource.Resource):
42
42
  """Helper class for datasets."""
43
43
 
44
- branch: api_types.Branch
44
+ _branch: api_types.Branch = None
45
45
  _transaction: api_types.Transaction | None = None
46
46
  __created__: bool | None = None
47
47
  rid_start: ClassVar[str] = "ri.foundry.main.dataset"
@@ -55,6 +55,22 @@ class Dataset(resource.Resource):
55
55
  raise RuntimeError(msg)
56
56
  super().__init__(*args, **kwargs)
57
57
 
58
+ @property
59
+ def branch(self) -> api_types.Branch:
60
+ """The branch of the dataset.
61
+
62
+ If self._branch is not set, and the default "master" branch does not exist, it will be created.
63
+ """
64
+ if not self._branch:
65
+ # create branch with default name, if the branch is not set
66
+ # (e.g. when created via get_resource or directly instantiated)
67
+ self.switch_branch("master", create_branch_if_not_exists=True)
68
+ return self._branch
69
+
70
+ @branch.setter
71
+ def branch(self, branch: api_types.DatasetBranch):
72
+ self._branch = branch
73
+
58
74
  @classmethod
59
75
  def from_rid(
60
76
  cls,
@@ -85,16 +101,12 @@ class Dataset(resource.Resource):
85
101
  if isinstance(branch, dict):
86
102
  inst.branch = branch
87
103
  else:
88
- try:
89
- inst.branch = context.catalog.api_get_branch(rid, branch).json()
90
- except BranchNotFoundError:
91
- if create_branch_if_not_exists:
92
- inst.branch = context.catalog.api_create_branch(
93
- dataset_rid=rid,
94
- branch_id=branch,
95
- parent_ref=parent_ref,
96
- parent_branch_id=parent_branch_id,
97
- ).json()
104
+ inst.switch_branch(
105
+ branch=branch,
106
+ create_branch_if_not_exists=create_branch_if_not_exists,
107
+ parent_ref=parent_ref,
108
+ parent_branch_id=parent_branch_id,
109
+ )
98
110
  return inst
99
111
 
100
112
  @classmethod
@@ -128,16 +140,12 @@ class Dataset(resource.Resource):
128
140
  """
129
141
  try:
130
142
  inst = super().from_path(context, path, **kwargs)
131
- try:
132
- inst.branch = context.catalog.api_get_branch(inst.rid, branch).json()
133
- except BranchNotFoundError:
134
- if create_branch_if_not_exists:
135
- inst.branch = context.catalog.api_create_branch(
136
- dataset_rid=inst.rid,
137
- branch_id=branch,
138
- parent_ref=parent_ref,
139
- parent_branch_id=parent_branch_id,
140
- ).json()
143
+ inst.switch_branch(
144
+ branch=branch,
145
+ create_branch_if_not_exists=create_branch_if_not_exists,
146
+ parent_ref=parent_ref,
147
+ parent_branch_id=parent_branch_id,
148
+ )
141
149
  inst.__created__ = False
142
150
  except ResourceNotFoundError:
143
151
  if create_if_not_exist:
@@ -160,14 +168,9 @@ class Dataset(resource.Resource):
160
168
  See :py:meth:`~foundry_dev_tools.clients.catalog.CatalogClient.api_create_dataset`.
161
169
  """
162
170
  rid = context.catalog.api_create_dataset(path).json()["rid"]
163
- branch = context.catalog.api_create_branch(
164
- rid,
165
- branch,
166
- parent_ref=parent_ref,
167
- parent_branch_id=parent_branch_id,
168
- ).json()
169
171
 
170
- inst = cls.from_rid(context, rid, branch=branch)
172
+ inst = cls.from_rid(context, rid)
173
+ inst.switch_branch(branch=branch, parent_ref=parent_ref, parent_branch_id=parent_branch_id)
171
174
  inst.__created__ = True
172
175
  return inst
173
176
 
@@ -177,7 +180,7 @@ class Dataset(resource.Resource):
177
180
  parent_ref: api_types.TransactionRid | None = None,
178
181
  parent_branch_id: api_types.DatasetBranch | None = None,
179
182
  ) -> Self:
180
- """Creates a branch on a dataset.
183
+ """Creates a branch on a dataset and switches to it.
181
184
 
182
185
  Args:
183
186
  branch: the branch to create
@@ -195,15 +198,29 @@ class Dataset(resource.Resource):
195
198
  def switch_branch(
196
199
  self,
197
200
  branch: api_types.DatasetBranch,
201
+ create_branch_if_not_exists: bool = False,
202
+ parent_ref: api_types.TransactionRid | None = None,
203
+ parent_branch_id: api_types.DatasetBranch | None = None,
198
204
  ) -> Self:
199
205
  """Switch to another branch.
200
206
 
201
- Branch needs to exist.
202
-
203
207
  Args:
204
208
  branch: the name of the branch to switch to
209
+ create_branch_if_not_exists: create branch if branch does not exist,
210
+ branch always will be created if resource does not exist
211
+ parent_ref: optionally the transaction off which the branch will be based
212
+ (only used if branch needs to be created)
213
+ parent_branch_id: optionally a parent branch name, otherwise a root branch
214
+ (only used if branch needs to be created)
215
+
205
216
  """
206
- self.branch = self.get_branch(branch)
217
+ try:
218
+ self.branch = self.get_branch(branch)
219
+ except BranchNotFoundError:
220
+ if create_branch_if_not_exists:
221
+ self.create_branch(branch=branch, parent_ref=parent_ref, parent_branch_id=parent_branch_id)
222
+ else:
223
+ raise
207
224
  return self
208
225
 
209
226
  def get_branch(self, branch: api_types.DatasetBranch) -> api_types.Branch:
@@ -797,8 +814,6 @@ class Dataset(resource.Resource):
797
814
 
798
815
  def _get_repr_dict(self) -> dict:
799
816
  d = super()._get_repr_dict()
800
- if not hasattr(self, "branch"):
801
- self.branch = self._context.catalog.api_get_branch(self.rid, "master").json()
802
817
  d["branch"] = self.branch["id"]
803
818
  return d
804
819
 
@@ -114,6 +114,7 @@ class Resource:
114
114
  disableInheritedPermissions: api_types.DisableInheritedPermissionsType | None = None, # noqa: N803
115
115
  propagatePermissions: bool | None = None, # noqa: N803
116
116
  resourceLevelRoleGrantsAllowed: bool | None = None, # noqa: N803
117
+ **kwargs,
117
118
  ):
118
119
  self.rid = rid
119
120
  self.name = name
@@ -153,6 +154,7 @@ class Resource:
153
154
  self.disable_inherited_permissions = disableInheritedPermissions
154
155
  self.propagate_permissions = propagatePermissions
155
156
  self.resource_level_role_grants_allowed = resourceLevelRoleGrantsAllowed
157
+ self._kwargs = kwargs
156
158
 
157
159
  @classmethod
158
160
  def _create_class(
@@ -1 +0,0 @@
1
- __version__ = '2.1.6'