modal 1.0.6.dev11__py3-none-any.whl → 1.0.6.dev13__py3-none-any.whl
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.
Potentially problematic release.
This version of modal might be problematic. Click here for more details.
- modal/client.pyi +2 -2
- modal/functions.pyi +6 -6
- modal/image.py +251 -0
- modal/image.pyi +104 -0
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/METADATA +1 -1
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/RECORD +11 -11
- modal_version/__init__.py +1 -1
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/WHEEL +0 -0
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/entry_points.txt +0 -0
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/licenses/LICENSE +0 -0
- {modal-1.0.6.dev11.dist-info → modal-1.0.6.dev13.dist-info}/top_level.txt +0 -0
modal/client.pyi
CHANGED
|
@@ -31,7 +31,7 @@ class _Client:
|
|
|
31
31
|
server_url: str,
|
|
32
32
|
client_type: int,
|
|
33
33
|
credentials: typing.Optional[tuple[str, str]],
|
|
34
|
-
version: str = "1.0.6.
|
|
34
|
+
version: str = "1.0.6.dev13",
|
|
35
35
|
):
|
|
36
36
|
"""mdmd:hidden
|
|
37
37
|
The Modal client object is not intended to be instantiated directly by users.
|
|
@@ -160,7 +160,7 @@ class Client:
|
|
|
160
160
|
server_url: str,
|
|
161
161
|
client_type: int,
|
|
162
162
|
credentials: typing.Optional[tuple[str, str]],
|
|
163
|
-
version: str = "1.0.6.
|
|
163
|
+
version: str = "1.0.6.dev13",
|
|
164
164
|
):
|
|
165
165
|
"""mdmd:hidden
|
|
166
166
|
The Modal client object is not intended to be instantiated directly by users.
|
modal/functions.pyi
CHANGED
|
@@ -428,7 +428,7 @@ class Function(
|
|
|
428
428
|
|
|
429
429
|
_call_generator: ___call_generator_spec[typing_extensions.Self]
|
|
430
430
|
|
|
431
|
-
class __remote_spec(typing_extensions.Protocol[
|
|
431
|
+
class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
|
|
432
432
|
def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
|
|
433
433
|
"""Calls the function remotely, executing it with the given arguments and returning the execution's result."""
|
|
434
434
|
...
|
|
@@ -437,7 +437,7 @@ class Function(
|
|
|
437
437
|
"""Calls the function remotely, executing it with the given arguments and returning the execution's result."""
|
|
438
438
|
...
|
|
439
439
|
|
|
440
|
-
remote: __remote_spec[modal._functions.
|
|
440
|
+
remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
|
|
441
441
|
|
|
442
442
|
class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
|
|
443
443
|
def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
|
|
@@ -464,7 +464,7 @@ class Function(
|
|
|
464
464
|
"""
|
|
465
465
|
...
|
|
466
466
|
|
|
467
|
-
class ___experimental_spawn_spec(typing_extensions.Protocol[
|
|
467
|
+
class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
|
|
468
468
|
def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
|
|
469
469
|
"""[Experimental] Calls the function with the given arguments, without waiting for the results.
|
|
470
470
|
|
|
@@ -488,7 +488,7 @@ class Function(
|
|
|
488
488
|
...
|
|
489
489
|
|
|
490
490
|
_experimental_spawn: ___experimental_spawn_spec[
|
|
491
|
-
modal._functions.
|
|
491
|
+
modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
|
|
492
492
|
]
|
|
493
493
|
|
|
494
494
|
class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
|
|
@@ -497,7 +497,7 @@ class Function(
|
|
|
497
497
|
|
|
498
498
|
_spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
|
|
499
499
|
|
|
500
|
-
class __spawn_spec(typing_extensions.Protocol[
|
|
500
|
+
class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
|
|
501
501
|
def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
|
|
502
502
|
"""Calls the function with the given arguments, without waiting for the results.
|
|
503
503
|
|
|
@@ -518,7 +518,7 @@ class Function(
|
|
|
518
518
|
"""
|
|
519
519
|
...
|
|
520
520
|
|
|
521
|
-
spawn: __spawn_spec[modal._functions.
|
|
521
|
+
spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
|
|
522
522
|
|
|
523
523
|
def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
|
|
524
524
|
"""Return the inner Python object wrapped by this Modal Function."""
|
modal/image.py
CHANGED
|
@@ -1222,6 +1222,114 @@ class _Image(_Object, type_prefix="im"):
|
|
|
1222
1222
|
gpu_config=parse_gpu_config(gpu),
|
|
1223
1223
|
)
|
|
1224
1224
|
|
|
1225
|
+
def uv_pip_install(
|
|
1226
|
+
self,
|
|
1227
|
+
*packages: Union[str, list[str]], # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
|
|
1228
|
+
requirements: Optional[list[str]] = None, # Passes -r (--requirements) to uv pip install
|
|
1229
|
+
find_links: Optional[str] = None, # Passes -f (--find-links) to uv pip install
|
|
1230
|
+
index_url: Optional[str] = None, # Passes -i (--index-url) to uv pip install
|
|
1231
|
+
extra_index_url: Optional[str] = None, # Passes --extra-index-url to uv pip install
|
|
1232
|
+
pre: bool = False, # Allow pre-releases using uv pip install --prerelease allow
|
|
1233
|
+
extra_options: str = "", # Additional options to pass to pip install, e.g. "--no-build-isolation"
|
|
1234
|
+
force_build: bool = False, # Ignore cached builds, similar to 'docker build --no-cache'
|
|
1235
|
+
uv_version: Optional[str] = None, # uv version to use
|
|
1236
|
+
secrets: Sequence[_Secret] = [],
|
|
1237
|
+
gpu: GPU_T = None,
|
|
1238
|
+
) -> "_Image":
|
|
1239
|
+
"""Install a list of Python packages using uv pip install.
|
|
1240
|
+
|
|
1241
|
+
**Examples**
|
|
1242
|
+
|
|
1243
|
+
Simple installation:
|
|
1244
|
+
```python
|
|
1245
|
+
image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
|
|
1246
|
+
```
|
|
1247
|
+
|
|
1248
|
+
This method assumes that:
|
|
1249
|
+
- Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
|
|
1250
|
+
- Shell supports backticks for substitution
|
|
1251
|
+
- `which` command is on the `$PATH`
|
|
1252
|
+
"""
|
|
1253
|
+
pkgs = _flatten_str_args("uv_pip_install", "packages", packages)
|
|
1254
|
+
|
|
1255
|
+
if requirements is None or isinstance(requirements, list):
|
|
1256
|
+
requirements = requirements or []
|
|
1257
|
+
else:
|
|
1258
|
+
raise InvalidError("requirements must be None or a list of strings")
|
|
1259
|
+
|
|
1260
|
+
if not pkgs and not requirements:
|
|
1261
|
+
return self
|
|
1262
|
+
elif not _validate_packages(pkgs):
|
|
1263
|
+
raise InvalidError(
|
|
1264
|
+
"Package list for `Image.uv_pip_install` cannot contain other arguments;"
|
|
1265
|
+
" try the `extra_options` parameter instead."
|
|
1266
|
+
)
|
|
1267
|
+
|
|
1268
|
+
def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
|
|
1269
|
+
commands = ["FROM base"]
|
|
1270
|
+
UV_ROOT = "/.uv"
|
|
1271
|
+
if uv_version is None:
|
|
1272
|
+
commands.append(f"COPY --from=ghcr.io/astral-sh/uv:latest /uv {UV_ROOT}/uv")
|
|
1273
|
+
else:
|
|
1274
|
+
commands.append(f"COPY --from=ghcr.io/astral-sh/uv:{uv_version} /uv {UV_ROOT}/uv")
|
|
1275
|
+
|
|
1276
|
+
# NOTE: Using `which python` assumes:
|
|
1277
|
+
# - python is on the PATH and uv is installing into the first python in the PATH
|
|
1278
|
+
# - the shell supports backticks for substitution
|
|
1279
|
+
# - `which` command is on the PATH
|
|
1280
|
+
uv_pip_args = ["--python `which python`", "--compile-bytecode"]
|
|
1281
|
+
context_files = {}
|
|
1282
|
+
|
|
1283
|
+
if find_links:
|
|
1284
|
+
uv_pip_args.append(f"--find-links {shlex.quote(find_links)}")
|
|
1285
|
+
if index_url:
|
|
1286
|
+
uv_pip_args.append(f"--index-url {shlex.quote(index_url)}")
|
|
1287
|
+
if extra_index_url:
|
|
1288
|
+
uv_pip_args.append(f"--extra-index-url {shlex.quote(extra_index_url)}")
|
|
1289
|
+
if pre:
|
|
1290
|
+
uv_pip_args.append("--prerelease allow")
|
|
1291
|
+
if extra_options:
|
|
1292
|
+
uv_pip_args.append(extra_options)
|
|
1293
|
+
|
|
1294
|
+
if requirements:
|
|
1295
|
+
|
|
1296
|
+
def _generate_paths(idx: int, req: str) -> dict:
|
|
1297
|
+
local_path = os.path.expanduser(req)
|
|
1298
|
+
basename = os.path.basename(req)
|
|
1299
|
+
|
|
1300
|
+
# The requirement files can have the same name but in different directories:
|
|
1301
|
+
# requirements=["test/requirements.txt", "a/b/c/requirements.txt"]
|
|
1302
|
+
# To uniquely identify these files, we add a `idx` prefix to every file's basename
|
|
1303
|
+
# - `test/requirements.txt` -> `/.0_requirements.txt` in context -> `/.uv/0/requirements.txt` to uv
|
|
1304
|
+
# - `a/b/c/requirements.txt` -> `/.1_requirements.txt` in context -> `/.uv/1/requirements.txt` to uv
|
|
1305
|
+
return {
|
|
1306
|
+
"local_path": local_path,
|
|
1307
|
+
"context_path": f"/.{idx}_{basename}",
|
|
1308
|
+
"dest_path": f"{UV_ROOT}/{idx}/{basename}",
|
|
1309
|
+
}
|
|
1310
|
+
|
|
1311
|
+
requirement_paths = [_generate_paths(idx, req) for idx, req in enumerate(requirements)]
|
|
1312
|
+
requirements_cli = " ".join(f"--requirements {req['dest_path']}" for req in requirement_paths)
|
|
1313
|
+
uv_pip_args.append(requirements_cli)
|
|
1314
|
+
|
|
1315
|
+
commands.extend([f"COPY {req['context_path']} {req['dest_path']}" for req in requirement_paths])
|
|
1316
|
+
context_files.update({req["context_path"]: req["local_path"] for req in requirement_paths})
|
|
1317
|
+
|
|
1318
|
+
uv_pip_args.extend(shlex.quote(p) for p in sorted(pkgs))
|
|
1319
|
+
uv_pip_args_joined = " ".join(uv_pip_args)
|
|
1320
|
+
|
|
1321
|
+
commands.append(f"RUN {UV_ROOT}/uv pip install {uv_pip_args_joined}")
|
|
1322
|
+
|
|
1323
|
+
return DockerfileSpec(commands=commands, context_files=context_files)
|
|
1324
|
+
|
|
1325
|
+
return _Image._from_args(
|
|
1326
|
+
base_images={"base": self},
|
|
1327
|
+
dockerfile_function=build_dockerfile,
|
|
1328
|
+
force_build=self.force_build or force_build,
|
|
1329
|
+
gpu_config=parse_gpu_config(gpu),
|
|
1330
|
+
secrets=secrets,
|
|
1331
|
+
)
|
|
1332
|
+
|
|
1225
1333
|
def poetry_install_from_file(
|
|
1226
1334
|
self,
|
|
1227
1335
|
poetry_pyproject_toml: str,
|
|
@@ -1312,6 +1420,149 @@ class _Image(_Object, type_prefix="im"):
|
|
|
1312
1420
|
gpu_config=parse_gpu_config(gpu),
|
|
1313
1421
|
)
|
|
1314
1422
|
|
|
1423
|
+
def uv_sync(
|
|
1424
|
+
self,
|
|
1425
|
+
uv_project_dir: str = "./", # Path to local uv managed project
|
|
1426
|
+
*,
|
|
1427
|
+
force_build: bool = False, # Ignore cached builds, similar to 'docker build --no-cache'
|
|
1428
|
+
groups: Optional[list[str]] = None, # Dependency group to install using `uv sync --group`
|
|
1429
|
+
extras: Optional[list[str]] = None, # Optional dependencies to install using `uv sync --extra`
|
|
1430
|
+
frozen: bool = True, # If True, then we run `uv sync --frozen` when a uv.lock file is present
|
|
1431
|
+
extra_options: str = "", # Extra options to pass to `uv sync`
|
|
1432
|
+
uv_version: Optional[str] = None, # uv version to use
|
|
1433
|
+
secrets: Sequence[_Secret] = [],
|
|
1434
|
+
gpu: GPU_T = None,
|
|
1435
|
+
) -> "_Image":
|
|
1436
|
+
"""Creates a virtual environment with the dependencies in a uv managed project with `uv sync`.
|
|
1437
|
+
|
|
1438
|
+
**Examples**
|
|
1439
|
+
```python
|
|
1440
|
+
image = modal.Image.debian_slim().uv_sync()
|
|
1441
|
+
```
|
|
1442
|
+
"""
|
|
1443
|
+
|
|
1444
|
+
def _normalize_items(items, name) -> list[str]:
|
|
1445
|
+
if items is None:
|
|
1446
|
+
return []
|
|
1447
|
+
elif isinstance(items, list):
|
|
1448
|
+
return items
|
|
1449
|
+
else:
|
|
1450
|
+
raise InvalidError(f"{name} must be None or a list of strings")
|
|
1451
|
+
|
|
1452
|
+
groups = _normalize_items(groups, "groups")
|
|
1453
|
+
extras = _normalize_items(extras, "extras")
|
|
1454
|
+
|
|
1455
|
+
def _check_pyproject_toml(pyproject_toml: str, version: ImageBuilderVersion):
|
|
1456
|
+
if not os.path.exists(pyproject_toml):
|
|
1457
|
+
raise InvalidError(f"Expected {pyproject_toml} to exist")
|
|
1458
|
+
|
|
1459
|
+
import toml
|
|
1460
|
+
|
|
1461
|
+
with open(pyproject_toml) as f:
|
|
1462
|
+
pyproject_toml_content = toml.load(f)
|
|
1463
|
+
|
|
1464
|
+
if (
|
|
1465
|
+
"tool" in pyproject_toml_content
|
|
1466
|
+
and "uv" in pyproject_toml_content["tool"]
|
|
1467
|
+
and "workspace" in pyproject_toml_content["tool"]["uv"]
|
|
1468
|
+
):
|
|
1469
|
+
raise InvalidError("uv workspaces are not supported")
|
|
1470
|
+
|
|
1471
|
+
if version > "2024.10":
|
|
1472
|
+
# For builder version > 2024.10, modal is mounted at runtime and is not
|
|
1473
|
+
# a requirement in `uv.lock`
|
|
1474
|
+
return
|
|
1475
|
+
|
|
1476
|
+
dependencies = pyproject_toml_content["project"]["dependencies"]
|
|
1477
|
+
|
|
1478
|
+
for group in groups:
|
|
1479
|
+
if (
|
|
1480
|
+
"dependency-groups" in pyproject_toml_content
|
|
1481
|
+
and group in pyproject_toml_content["dependency-groups"]
|
|
1482
|
+
):
|
|
1483
|
+
dependencies += pyproject_toml_content["dependency-groups"][group]
|
|
1484
|
+
|
|
1485
|
+
for extra in extras:
|
|
1486
|
+
if (
|
|
1487
|
+
"project" in pyproject_toml_content
|
|
1488
|
+
and "optional-dependencies" in pyproject_toml_content["project"]
|
|
1489
|
+
and extra in pyproject_toml_content["project"]["optional-dependencies"]
|
|
1490
|
+
):
|
|
1491
|
+
dependencies += pyproject_toml_content["project"]["optional-dependencies"][extra]
|
|
1492
|
+
|
|
1493
|
+
PACKAGE_REGEX = re.compile(r"^[\w-]+")
|
|
1494
|
+
|
|
1495
|
+
def _extract_package(package) -> str:
|
|
1496
|
+
m = PACKAGE_REGEX.match(package)
|
|
1497
|
+
return m.group(0) if m else ""
|
|
1498
|
+
|
|
1499
|
+
if not any(_extract_package(dependency) == "modal" for dependency in dependencies):
|
|
1500
|
+
raise InvalidError(
|
|
1501
|
+
"Image builder version <= 2024.10 requires modal to be specified in your pyproject.toml file"
|
|
1502
|
+
)
|
|
1503
|
+
|
|
1504
|
+
def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
|
|
1505
|
+
uv_project_dir_ = os.path.expanduser(uv_project_dir)
|
|
1506
|
+
pyproject_toml = os.path.join(uv_project_dir_, "pyproject.toml")
|
|
1507
|
+
|
|
1508
|
+
UV_ROOT = "/.uv"
|
|
1509
|
+
uv_sync_args = [
|
|
1510
|
+
f"--project={UV_ROOT}",
|
|
1511
|
+
"--no-install-workspace", # Do not install the root project or any "uv workspace"
|
|
1512
|
+
"--compile-bytecode",
|
|
1513
|
+
]
|
|
1514
|
+
|
|
1515
|
+
for group in groups:
|
|
1516
|
+
uv_sync_args.append(f"--group={group}")
|
|
1517
|
+
for extra in extras:
|
|
1518
|
+
uv_sync_args.append(f"--extra={extra}")
|
|
1519
|
+
if extra_options:
|
|
1520
|
+
uv_sync_args.append(extra_options)
|
|
1521
|
+
|
|
1522
|
+
commands = ["FROM base"]
|
|
1523
|
+
|
|
1524
|
+
if uv_version is None:
|
|
1525
|
+
commands.append(f"COPY --from=ghcr.io/astral-sh/uv:latest /uv {UV_ROOT}/uv")
|
|
1526
|
+
else:
|
|
1527
|
+
commands.append(f"COPY --from=ghcr.io/astral-sh/uv:{uv_version} /uv {UV_ROOT}/uv")
|
|
1528
|
+
|
|
1529
|
+
context_files = {}
|
|
1530
|
+
|
|
1531
|
+
_check_pyproject_toml(pyproject_toml, version)
|
|
1532
|
+
|
|
1533
|
+
context_files["/.pyproject.toml"] = pyproject_toml
|
|
1534
|
+
commands.append(f"COPY /.pyproject.toml {UV_ROOT}/pyproject.toml")
|
|
1535
|
+
|
|
1536
|
+
uv_lock = os.path.join(uv_project_dir_, "uv.lock")
|
|
1537
|
+
if os.path.exists(uv_lock):
|
|
1538
|
+
context_files["/.uv.lock"] = uv_lock
|
|
1539
|
+
commands.append(f"COPY /.uv.lock {UV_ROOT}/uv.lock")
|
|
1540
|
+
|
|
1541
|
+
if frozen:
|
|
1542
|
+
# Do not update `uv.lock` when we have one when `frozen=True`. This it ehd efault because this
|
|
1543
|
+
# ensures that the runtime environment matches the local `uv.lock`.
|
|
1544
|
+
#
|
|
1545
|
+
# If `frozen=False`, then `uv sync` will update the the dependencies in the `uv.lock` file
|
|
1546
|
+
# during build time.
|
|
1547
|
+
uv_sync_args.append("--frozen")
|
|
1548
|
+
|
|
1549
|
+
uv_sync_args_joined = " ".join(uv_sync_args).strip()
|
|
1550
|
+
|
|
1551
|
+
commands += [
|
|
1552
|
+
f"RUN {UV_ROOT}/uv sync {uv_sync_args_joined}",
|
|
1553
|
+
f"ENV PATH={UV_ROOT}/.venv/bin:$PATH",
|
|
1554
|
+
]
|
|
1555
|
+
|
|
1556
|
+
return DockerfileSpec(commands=commands, context_files=context_files)
|
|
1557
|
+
|
|
1558
|
+
return _Image._from_args(
|
|
1559
|
+
base_images={"base": self},
|
|
1560
|
+
dockerfile_function=build_dockerfile,
|
|
1561
|
+
force_build=self.force_build or force_build,
|
|
1562
|
+
secrets=secrets,
|
|
1563
|
+
gpu_config=parse_gpu_config(gpu),
|
|
1564
|
+
)
|
|
1565
|
+
|
|
1315
1566
|
def dockerfile_commands(
|
|
1316
1567
|
self,
|
|
1317
1568
|
*dockerfile_commands: Union[str, list[str]],
|
modal/image.pyi
CHANGED
|
@@ -505,6 +505,36 @@ class _Image(modal._object._Object):
|
|
|
505
505
|
"""
|
|
506
506
|
...
|
|
507
507
|
|
|
508
|
+
def uv_pip_install(
|
|
509
|
+
self,
|
|
510
|
+
*packages: typing.Union[str, list[str]],
|
|
511
|
+
requirements: typing.Optional[list[str]] = None,
|
|
512
|
+
find_links: typing.Optional[str] = None,
|
|
513
|
+
index_url: typing.Optional[str] = None,
|
|
514
|
+
extra_index_url: typing.Optional[str] = None,
|
|
515
|
+
pre: bool = False,
|
|
516
|
+
extra_options: str = "",
|
|
517
|
+
force_build: bool = False,
|
|
518
|
+
uv_version: typing.Optional[str] = None,
|
|
519
|
+
secrets: collections.abc.Sequence[modal.secret._Secret] = [],
|
|
520
|
+
gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
|
|
521
|
+
) -> _Image:
|
|
522
|
+
"""Install a list of Python packages using uv pip install.
|
|
523
|
+
|
|
524
|
+
**Examples**
|
|
525
|
+
|
|
526
|
+
Simple installation:
|
|
527
|
+
```python
|
|
528
|
+
image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
|
|
529
|
+
```
|
|
530
|
+
|
|
531
|
+
This method assumes that:
|
|
532
|
+
- Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
|
|
533
|
+
- Shell supports backticks for substitution
|
|
534
|
+
- `which` command is on the `$PATH`
|
|
535
|
+
"""
|
|
536
|
+
...
|
|
537
|
+
|
|
508
538
|
def poetry_install_from_file(
|
|
509
539
|
self,
|
|
510
540
|
poetry_pyproject_toml: str,
|
|
@@ -534,6 +564,28 @@ class _Image(modal._object._Object):
|
|
|
534
564
|
"""
|
|
535
565
|
...
|
|
536
566
|
|
|
567
|
+
def uv_sync(
|
|
568
|
+
self,
|
|
569
|
+
uv_project_dir: str = "./",
|
|
570
|
+
*,
|
|
571
|
+
force_build: bool = False,
|
|
572
|
+
groups: typing.Optional[list[str]] = None,
|
|
573
|
+
extras: typing.Optional[list[str]] = None,
|
|
574
|
+
frozen: bool = True,
|
|
575
|
+
extra_options: str = "",
|
|
576
|
+
uv_version: typing.Optional[str] = None,
|
|
577
|
+
secrets: collections.abc.Sequence[modal.secret._Secret] = [],
|
|
578
|
+
gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
|
|
579
|
+
) -> _Image:
|
|
580
|
+
"""Creates a virtual environment with the dependencies in a uv managed project with `uv sync`.
|
|
581
|
+
|
|
582
|
+
**Examples**
|
|
583
|
+
```python
|
|
584
|
+
image = modal.Image.debian_slim().uv_sync()
|
|
585
|
+
```
|
|
586
|
+
"""
|
|
587
|
+
...
|
|
588
|
+
|
|
537
589
|
def dockerfile_commands(
|
|
538
590
|
self,
|
|
539
591
|
*dockerfile_commands: typing.Union[str, list[str]],
|
|
@@ -1348,6 +1400,36 @@ class Image(modal.object.Object):
|
|
|
1348
1400
|
"""
|
|
1349
1401
|
...
|
|
1350
1402
|
|
|
1403
|
+
def uv_pip_install(
|
|
1404
|
+
self,
|
|
1405
|
+
*packages: typing.Union[str, list[str]],
|
|
1406
|
+
requirements: typing.Optional[list[str]] = None,
|
|
1407
|
+
find_links: typing.Optional[str] = None,
|
|
1408
|
+
index_url: typing.Optional[str] = None,
|
|
1409
|
+
extra_index_url: typing.Optional[str] = None,
|
|
1410
|
+
pre: bool = False,
|
|
1411
|
+
extra_options: str = "",
|
|
1412
|
+
force_build: bool = False,
|
|
1413
|
+
uv_version: typing.Optional[str] = None,
|
|
1414
|
+
secrets: collections.abc.Sequence[modal.secret.Secret] = [],
|
|
1415
|
+
gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
|
|
1416
|
+
) -> Image:
|
|
1417
|
+
"""Install a list of Python packages using uv pip install.
|
|
1418
|
+
|
|
1419
|
+
**Examples**
|
|
1420
|
+
|
|
1421
|
+
Simple installation:
|
|
1422
|
+
```python
|
|
1423
|
+
image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
|
|
1424
|
+
```
|
|
1425
|
+
|
|
1426
|
+
This method assumes that:
|
|
1427
|
+
- Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
|
|
1428
|
+
- Shell supports backticks for substitution
|
|
1429
|
+
- `which` command is on the `$PATH`
|
|
1430
|
+
"""
|
|
1431
|
+
...
|
|
1432
|
+
|
|
1351
1433
|
def poetry_install_from_file(
|
|
1352
1434
|
self,
|
|
1353
1435
|
poetry_pyproject_toml: str,
|
|
@@ -1377,6 +1459,28 @@ class Image(modal.object.Object):
|
|
|
1377
1459
|
"""
|
|
1378
1460
|
...
|
|
1379
1461
|
|
|
1462
|
+
def uv_sync(
|
|
1463
|
+
self,
|
|
1464
|
+
uv_project_dir: str = "./",
|
|
1465
|
+
*,
|
|
1466
|
+
force_build: bool = False,
|
|
1467
|
+
groups: typing.Optional[list[str]] = None,
|
|
1468
|
+
extras: typing.Optional[list[str]] = None,
|
|
1469
|
+
frozen: bool = True,
|
|
1470
|
+
extra_options: str = "",
|
|
1471
|
+
uv_version: typing.Optional[str] = None,
|
|
1472
|
+
secrets: collections.abc.Sequence[modal.secret.Secret] = [],
|
|
1473
|
+
gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
|
|
1474
|
+
) -> Image:
|
|
1475
|
+
"""Creates a virtual environment with the dependencies in a uv managed project with `uv sync`.
|
|
1476
|
+
|
|
1477
|
+
**Examples**
|
|
1478
|
+
```python
|
|
1479
|
+
image = modal.Image.debian_slim().uv_sync()
|
|
1480
|
+
```
|
|
1481
|
+
"""
|
|
1482
|
+
...
|
|
1483
|
+
|
|
1380
1484
|
def dockerfile_commands(
|
|
1381
1485
|
self,
|
|
1382
1486
|
*dockerfile_commands: typing.Union[str, list[str]],
|
|
@@ -22,7 +22,7 @@ modal/app.py,sha256=fCKq3TJ2Y5LB2WKNs6pp_5XECNH5avUL01jQljuoYRU,46603
|
|
|
22
22
|
modal/app.pyi,sha256=Z6wi_dkXywiaM2rvAvguj2Wgu9ZgPjMSLl1nH1a7EYI,42243
|
|
23
23
|
modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
|
|
24
24
|
modal/client.py,sha256=OwISJvkgMb-rHm9Gc4i-7YcDgGiZgwJ7F_PzwZH7a6Q,16847
|
|
25
|
-
modal/client.pyi,sha256=
|
|
25
|
+
modal/client.pyi,sha256=Xtw-t5manyZm58JHPwt41fO99AUqDyPPE1KQCLfRVwg,15081
|
|
26
26
|
modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
|
|
27
27
|
modal/cloud_bucket_mount.pyi,sha256=-qSfYAQvIoO_l2wsCCGTG5ZUwQieNKXdAO00yP1-LYU,7394
|
|
28
28
|
modal/cls.py,sha256=EFrM949jNXJpmwB2G_1d28b8IpHShfKIEIaiPkZqeOU,39881
|
|
@@ -39,10 +39,10 @@ modal/file_io.py,sha256=SCBfLk5gRieqdTVlA_f-2YHHtRp7Iy_sA6iR1zPsO3c,21100
|
|
|
39
39
|
modal/file_io.pyi,sha256=_Hm-59MrppfuBYxtzdJkA2Jf9zI5LlbPh_0gURk0_7s,15222
|
|
40
40
|
modal/file_pattern_matcher.py,sha256=urAue8es8jxqX94k9EYoZxxhtfgOlsEES8lbFHOorzc,7734
|
|
41
41
|
modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
|
|
42
|
-
modal/functions.pyi,sha256=
|
|
42
|
+
modal/functions.pyi,sha256=ffW_kkU8AxMuV77ltmjK3nslXW_2iwEjKsT-Cgd4Trs,34840
|
|
43
43
|
modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
|
|
44
|
-
modal/image.py,sha256=
|
|
45
|
-
modal/image.pyi,sha256=
|
|
44
|
+
modal/image.py,sha256=lfbLICSDz4DPEiSipvGasL8EEu8ydHeyn3qBwgFPgBo,105262
|
|
45
|
+
modal/image.pyi,sha256=RGxpmYZUJXtZrH9H3xPHdfHFd_KpmDp3ZHrDS8vUKlI,71760
|
|
46
46
|
modal/io_streams.py,sha256=FUDpBsVK8isqwyC7DtAcQZhaHlMFSaNZGhYJOg-SFW0,15590
|
|
47
47
|
modal/io_streams.pyi,sha256=5b3b93ztZeR8IpJtNIGffX24QLPgocE4-gAps8y7CKU,13824
|
|
48
48
|
modal/mount.py,sha256=VrExPZApUnuh9shJx-tzdmQJ9ASTSK-SEaYHDBkQl-k,36632
|
|
@@ -147,7 +147,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
|
|
|
147
147
|
modal/requirements/PREVIEW.txt,sha256=KxDaVTOwatHvboDo4lorlgJ7-n-MfAwbPwxJ0zcJqrs,312
|
|
148
148
|
modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
|
|
149
149
|
modal/requirements/base-images.json,sha256=3oKVHov9vE88hMQGnn1OqDQK-ohxNF_TEL2DNPKg09s,1051
|
|
150
|
-
modal-1.0.6.
|
|
150
|
+
modal-1.0.6.dev13.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
|
|
151
151
|
modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
|
|
152
152
|
modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
|
|
153
153
|
modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
|
|
@@ -170,10 +170,10 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
|
|
|
170
170
|
modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
|
|
171
171
|
modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
|
|
172
172
|
modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
173
|
-
modal_version/__init__.py,sha256=
|
|
173
|
+
modal_version/__init__.py,sha256=1DNcleMbee0mgHKBMdimtMgN9p-uw7dTrNxScGb4gio,121
|
|
174
174
|
modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
|
|
175
|
-
modal-1.0.6.
|
|
176
|
-
modal-1.0.6.
|
|
177
|
-
modal-1.0.6.
|
|
178
|
-
modal-1.0.6.
|
|
179
|
-
modal-1.0.6.
|
|
175
|
+
modal-1.0.6.dev13.dist-info/METADATA,sha256=IsYrSpY3Yeu8atjpDV4m1shlPjgtZapNYbgVvWpWboI,2462
|
|
176
|
+
modal-1.0.6.dev13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
|
|
177
|
+
modal-1.0.6.dev13.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
|
|
178
|
+
modal-1.0.6.dev13.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
|
|
179
|
+
modal-1.0.6.dev13.dist-info/RECORD,,
|
modal_version/__init__.py
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|