foundry-dev-tools 2.1.5__tar.gz → 2.1.6__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.5 → foundry_dev_tools-2.1.6}/PKG-INFO +1 -1
  2. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/pyproject.toml +1 -1
  3. foundry_dev_tools-2.1.6/src/foundry_dev_tools/__about__.py +1 -0
  4. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/git.py +3 -3
  5. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/context_client.py +41 -5
  6. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/resources/dataset.py +3 -1
  7. foundry_dev_tools-2.1.5/src/foundry_dev_tools/__about__.py +0 -1
  8. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/README.md +0 -0
  9. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/__init__.py +0 -0
  10. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/_optional/__init__.py +0 -0
  11. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/_optional/pandas.py +0 -0
  12. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/_optional/polars.py +0 -0
  13. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/_optional/pyarrow.py +0 -0
  14. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/_optional/pyspark.py +0 -0
  15. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cached_foundry_client.py +0 -0
  16. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/__init__.py +0 -0
  17. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/build.py +0 -0
  18. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/config.py +0 -0
  19. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/git_credential_foundry.py +0 -0
  20. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/info.py +0 -0
  21. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/main.py +0 -0
  22. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/s3.py +0 -0
  23. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/cli/stubs.py +0 -0
  24. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/__init__.py +0 -0
  25. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/api_client.py +0 -0
  26. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/build2.py +0 -0
  27. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/catalog.py +0 -0
  28. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/compass.py +0 -0
  29. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/data_proxy.py +0 -0
  30. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/foundry_sql_server.py +0 -0
  31. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/foundry_stats.py +0 -0
  32. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/jemma.py +0 -0
  33. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/metadata.py +0 -0
  34. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/multipass.py +0 -0
  35. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/public_ontologies_client.py +0 -0
  36. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/s3_client.py +0 -0
  37. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/clients/schema_inference.py +0 -0
  38. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/config/__init__.py +0 -0
  39. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/config/config.py +0 -0
  40. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/config/config_types.py +0 -0
  41. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/config/context.py +0 -0
  42. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/config/token_provider.py +0 -0
  43. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/__init__.py +0 -0
  44. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/compass.py +0 -0
  45. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/config.py +0 -0
  46. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/dataset.py +0 -0
  47. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/handling.py +0 -0
  48. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/meta.py +0 -0
  49. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/multipass.py +0 -0
  50. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/errors/sql.py +0 -0
  51. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/foundry_api_client.py +0 -0
  52. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/helpers/__init__.py +0 -0
  53. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/helpers/multipass/__init__.py +0 -0
  54. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/helpers/multipass/group.py +0 -0
  55. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/helpers/multipass/principal.py +0 -0
  56. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/helpers/multipass/user.py +0 -0
  57. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/py.typed +0 -0
  58. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/resources/__init__.py +0 -0
  59. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/resources/folder.py +0 -0
  60. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/resources/resource.py +0 -0
  61. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/__init__.py +0 -0
  62. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/api_types.py +0 -0
  63. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/async_s3.py +0 -0
  64. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/caches/__init__.py +0 -0
  65. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/caches/metadata_store.py +0 -0
  66. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/caches/spark_caches.py +0 -0
  67. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/cli.py +0 -0
  68. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/clients.py +0 -0
  69. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/compat.py +0 -0
  70. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/config.py +0 -0
  71. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/converter/__init__.py +0 -0
  72. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/converter/foundry_spark.py +0 -0
  73. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/misc.py +0 -0
  74. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/public_api_types.py +0 -0
  75. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/repo.py +0 -0
  76. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/src/foundry_dev_tools/utils/s3.py +0 -0
  77. {foundry_dev_tools-2.1.5 → foundry_dev_tools-2.1.6}/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.5
3
+ Version: 2.1.6
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
@@ -41,7 +41,7 @@ dependencies = [
41
41
  "tomli_w",
42
42
  ]
43
43
  dynamic = []
44
- version = "2.1.5"
44
+ version = "2.1.6"
45
45
 
46
46
  [project.license]
47
47
  text = "Apache-2.0"
@@ -0,0 +1 @@
1
+ __version__ = '2.1.6'
@@ -3,7 +3,7 @@
3
3
  import os
4
4
  import re
5
5
  import subprocess
6
- from urllib.parse import urlparse
6
+ from urllib.parse import quote, urlparse
7
7
 
8
8
  import click
9
9
  from rich.console import Console
@@ -65,9 +65,9 @@ def _git_clone_cli(ctx: FoundryContext, console: Console, repo: str, path: str |
65
65
  if repo_id is None:
66
66
  return
67
67
  repo_object = ctx.get_resource(repo_id)
68
- clone_url = f"{ctx.host.scheme}://{ctx.host.domain}/stemma/git/{repo_id}/{repo_object.name}"
68
+ clone_url = f"{ctx.host.scheme}://{ctx.host.domain}" + quote(f"/stemma/git/{repo_id}/{repo_object.name}")
69
69
 
70
- _path = "" if path is None else path
70
+ _path = repo_object.name if path is None else path
71
71
  console.print(f"Executing git clone {clone_url} {path}")
72
72
  if _path:
73
73
  os.execvp("git", ["git", "clone", clone_url, _path]) # noqa: S606
@@ -5,6 +5,8 @@ from __future__ import annotations
5
5
  import logging
6
6
  import numbers
7
7
  import os
8
+ import time
9
+ import typing
8
10
  from typing import TYPE_CHECKING, Literal
9
11
 
10
12
  import requests
@@ -32,6 +34,40 @@ if TYPE_CHECKING:
32
34
  from foundry_dev_tools.config.context import FoundryContext
33
35
 
34
36
  DEFAULT_TIMEOUT = (60, None)
37
+ LOGGER = logging.getLogger(__name__)
38
+ LOGGER.setLevel(logging.DEBUG)
39
+
40
+
41
+ def retry(times: int, exceptions: tuple[Exception]) -> typing.Callable:
42
+ """Retry Decorator.
43
+
44
+ Code Copied from https://stackoverflow.com/a/64030200
45
+
46
+ Retries the wrapped function/method `times` times if the exceptions listed
47
+ in ``exceptions`` are thrown
48
+ :param times: The number of times to repeat the wrapped function/method
49
+ :type times: Int
50
+ :param Exceptions: Lists of exceptions that trigger a retry attempt
51
+ :type Exceptions: Tuple of Exceptions
52
+ """
53
+
54
+ def decorator(func: typing.Callable) -> typing.Callable:
55
+ def newfn(*args, **kwargs) -> typing.Callable:
56
+ attempt = 0
57
+ while attempt < times:
58
+ try:
59
+ return func(*args, **kwargs)
60
+ except exceptions: # noqa: PERF203
61
+ LOGGER.debug(
62
+ "Exception thrown when attempting to run %s, attempt " "%d of %d", func, attempt, times
63
+ )
64
+ time.sleep(0.1)
65
+ attempt += 1
66
+ return func(*args, **kwargs)
67
+
68
+ return newfn
69
+
70
+ return decorator
35
71
 
36
72
 
37
73
  class ContextHTTPClient(requests.Session):
@@ -43,11 +79,10 @@ class ContextHTTPClient(requests.Session):
43
79
  if self.context.config.requests_ca_bundle:
44
80
  self.verify = os.fspath(self.context.config.requests_ca_bundle)
45
81
  self.auth = lambda r: self.context.token_provider.requests_auth_handler(r)
46
- self._logger = logging.getLogger(__name__)
47
- self._logger.setLevel(logging.DEBUG)
48
82
  self._counter = 0
49
83
  self.headers = {"User-Agent": f"foundry-dev-tools/{__version__}/python-requests"}
50
84
 
85
+ @retry(times=3, exceptions=requests.exceptions.ConnectionError)
51
86
  def request(
52
87
  self,
53
88
  method: str | bytes,
@@ -93,7 +128,7 @@ class ContextHTTPClient(requests.Session):
93
128
  verify = rcab
94
129
  if self.context.config.debug:
95
130
  self._counter = count = self._counter + 1
96
- self._logger.debug(f"(r{count}) Making {method!s} request to {url!s}") # noqa: G004
131
+ LOGGER.debug(f"(r{count}) Making {method!s} request to {url!s}") # noqa: G004
97
132
 
98
133
  if isinstance(timeout, numbers.Number):
99
134
  # add default connect timeout if timeout is a number
@@ -121,10 +156,11 @@ class ContextHTTPClient(requests.Session):
121
156
  json=json,
122
157
  )
123
158
  if self.context.config.debug:
124
- self._logger.debug(
159
+ LOGGER.debug(
125
160
  f"(r{count}) Got response status={response.status_code}, " # noqa: G004
126
161
  f"content_type={response.headers.get('content-type')}, "
127
- f"content_length={response.headers.get('content-length')}",
162
+ f"content_length={response.headers.get('content-length')}, "
163
+ f"Server-Timing={response.headers.get('Server-Timing')}",
128
164
  )
129
165
  raise_foundry_api_error(response, error_handling)
130
166
  return response
@@ -797,7 +797,9 @@ class Dataset(resource.Resource):
797
797
 
798
798
  def _get_repr_dict(self) -> dict:
799
799
  d = super()._get_repr_dict()
800
- d["branch"] = d["branch"]["id"]
800
+ if not hasattr(self, "branch"):
801
+ self.branch = self._context.catalog.api_get_branch(self.rid, "master").json()
802
+ d["branch"] = self.branch["id"]
801
803
  return d
802
804
 
803
805
 
@@ -1 +0,0 @@
1
- __version__ = '2.1.5'