modal 0.62.115__py3-none-any.whl → 0.72.13__py3-none-any.whl

test/watcher_test.py

@@ -1,58 +0,0 @@
-# Copyright Modal Labs 2023
-import pytest
-import random
-import string
-import sys
-from pathlib import Path
-
-from watchfiles import Change
-
-import modal
-from modal._watcher import _watch_args_from_mounts
-from modal.mount import Mount, _Mount
-
-
-@pytest.mark.asyncio
-async def test__watch_args_from_mounts(monkeypatch, test_dir):
-    paths, watch_filter = _watch_args_from_mounts(
-        mounts=[
-            _Mount.from_local_file("/x/foo.py", remote_path="/foo.py"),
-            _Mount.from_local_dir("/one/two/bucklemyshoe", remote_path="/"),
-            _Mount.from_local_dir("/x/z", remote_path="/z"),
-        ]
-    )
-
-    assert paths == {Path("/x").absolute(), Path("/one/two/bucklemyshoe").absolute(), Path("/x/z").absolute()}
-    assert watch_filter(Change.modified, "/x/foo.py")
-    assert not watch_filter(Change.modified, "/x/notwatched.py")
-    assert not watch_filter(Change.modified, "/x/y/foo.py")
-    assert watch_filter(Change.modified, "/x/z/bar.py")
-    random_filename = "".join(random.choices(string.ascii_uppercase + string.digits, k=10))
-    assert watch_filter(Change.modified, f"/one/two/bucklemyshoe/{random_filename}")
-    assert not watch_filter(Change.modified, "/one/two/bucklemyshoe/.DS_Store")
-
-
-def dummy():
-    pass
-
-
-@pytest.fixture()
-def clean_sys_modules(monkeypatch):
-    # run test assuming no user-defined modules have been loaded
-    module_names = set()
-    for name, mod in sys.modules.items():
-        if getattr(mod, "__file__", None) and not ("/lib/" in mod.__file__ or "/site-packages/" in mod.__file__):
-            module_names.add(name)
-
-    for m in module_names:
-        monkeypatch.delitem(sys.modules, m)
-
-
-@pytest.mark.usefixtures("clean_sys_modules")
-@pytest.mark.skip("not working in ci for some reason. deactivating for now")  # TODO(elias) fix
-def test_watch_mounts_ignore_local():
-    app = modal.App()
-    app.function(mounts=[Mount.from_name("some-published-mount")])(dummy)
-
-    mounts = app._get_watch_mounts()
-    assert len(mounts) == 0

test/webhook_test.py

@@ -1,145 +0,0 @@
-# Copyright Modal Labs 2022
-import pathlib
-import pytest
-import subprocess
-import sys
-
-from fastapi.testclient import TestClient
-
-from modal import App, asgi_app, web_endpoint, wsgi_app
-from modal._asgi import webhook_asgi_app
-from modal.exception import InvalidError
-from modal.functions import Function
-from modal.running_app import RunningApp
-from modal_proto import api_pb2
-
-app = App()
-
-
-@app.function(cpu=42)
-@web_endpoint(method="PATCH")
-async def f(x):
-    return {"square": x**2}
-
-
-@pytest.mark.asyncio
-async def test_webhook(servicer, client, reset_container_app):
-    async with app.run(client=client):
-        assert f.web_url
-
-        assert servicer.app_functions["fu-1"].webhook_config.type == api_pb2.WEBHOOK_TYPE_FUNCTION
-        assert servicer.app_functions["fu-1"].webhook_config.method == "PATCH"
-
-        # Make sure we can call the webhooks
-        # TODO: reinstate `.remote` check when direct webhook fn invocation is fixed.
-        # assert await f.remote(10)
-        assert await f.local(100) == {"square": 10000}
-
-        # Make sure the container gets the app id as well
-        container_app = RunningApp(app_id=app.app_id)
-        app._init_container(client, container_app)
-        assert isinstance(f, Function)
-        assert f.web_url
-
-
-def test_webhook_cors():
-    def handler():
-        return {"message": "Hello, World!"}
-
-    app = webhook_asgi_app(handler, method="GET")
-    client = TestClient(app)
-    resp = client.options(
-        "/",
-        headers={
-            "Origin": "http://example.com",
-            "Access-Control-Request-Method": "POST",
-        },
-    )
-    assert resp.headers["Access-Control-Allow-Origin"] == "http://example.com"
-
-    assert client.get("/").json() == {"message": "Hello, World!"}
-    assert client.post("/").status_code == 405  # Method Not Allowed
-
-
-@pytest.mark.asyncio
-async def test_webhook_no_docs():
-    # FastAPI automatically sets docs URLs for apps, which we disable because it
-    # can be unexpected for users who are unfamilar with FastAPI.
-    #
-    # https://fastapi.tiangolo.com/tutorial/metadata/#docs-urls
-
-    def handler():
-        return {"message": "Hello, World!"}
-
-    app = webhook_asgi_app(handler, method="GET")
-    client = TestClient(app)
-    assert client.get("/docs").status_code == 404
-    assert client.get("/redoc").status_code == 404
-
-
-def test_webhook_generator():
-    app = App()
-
-    with pytest.raises(InvalidError) as excinfo:
-
-        @app.function(serialized=True)
-        @web_endpoint()
-        def web_gen():
-            yield None
-
-    assert "streaming" in str(excinfo.value).lower()
-
-
-@pytest.mark.asyncio
-async def test_webhook_forgot_function(servicer, client):
-    lib_dir = pathlib.Path(__file__).parent.parent
-    args = [sys.executable, "-m", "test.supports.webhook_forgot_function"]
-    ret = subprocess.run(args, cwd=lib_dir, stderr=subprocess.PIPE)
-    stderr = ret.stderr.decode()
-    assert "absent_minded_function" in stderr
-    assert "@app.function" in stderr
-
-
-@pytest.mark.asyncio
-async def test_webhook_decorator_in_wrong_order(servicer, client):
-    app = App()
-
-    with pytest.raises(InvalidError) as excinfo:
-
-        @web_endpoint()  # type: ignore
-        @app.function(serialized=True)
-        async def g(x):
-            pass
-
-    assert "wrong order" in str(excinfo.value).lower()
-
-
-@pytest.mark.asyncio
-async def test_asgi_wsgi(servicer, client):
-    app = App()
-
-    @app.function(serialized=True)
-    @asgi_app()
-    async def my_asgi(x):
-        pass
-
-    @app.function(serialized=True)
-    @wsgi_app()
-    async def my_wsgi(x):
-        pass
-
-    async with app.run(client=client):
-        pass
-
-    assert len(servicer.app_functions) == 2
-    assert servicer.app_functions["fu-1"].webhook_config.type == api_pb2.WEBHOOK_TYPE_ASGI_APP
-    assert servicer.app_functions["fu-2"].webhook_config.type == api_pb2.WEBHOOK_TYPE_WSGI_APP
-
-
-def test_positional_method(servicer, client):
-    with pytest.raises(InvalidError, match="method="):
-        web_endpoint("GET")
-    with pytest.raises(InvalidError, match="label="):
-        asgi_app("baz")
-    with pytest.raises(InvalidError, match="label="):
-        wsgi_app("baz")