Skip to content

Commit

Permalink
Merge branch 'main' into issue#3015
Browse files Browse the repository at this point in the history
  • Loading branch information
xeniumcode authored Mar 8, 2025
2 parents b540f54 + ec9c63e commit a5c6d70
Show file tree
Hide file tree
Showing 126 changed files with 5,557 additions and 940 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/test_be.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,45 @@ jobs:
if: ${{ matrix.dependencies == 'core,optional' }}
run: |
hatch run +py=${{ matrix.python-version }} test-optional:test -v tests/ -k "not test_cli" --durations=10
# Only run coverage on `main` so it is not blocking
test_coverage:
needs: changes
if: ${{ needs.changes.outputs.backend == 'true' && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
name: Test coverage
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/[email protected]

- uses: actions/checkout@v4

- name: 🥚 Install Hatch
uses: pypa/hatch@install

# This step is needed since some of our tests rely on the index.html file
- name: Create assets directory, copy over index.html
run: |
mkdir -p marimo/_static/assets
cp frontend/index.html marimo/_static/index.html
cp frontend/public/favicon.ico marimo/_static/favicon.ico
- name: Test with optional dependencies
run: |
hatch run +py=3.12 test-optional:test -v tests/ -k "not test_cli" --durations=10 \
--cov=marimo --junitxml=junit.xml -o junit_family=legacy
# Only upload coverage on `main` so it is not blocking
# and only on `3.12`, `ubuntu-latest`, with optional deps since it is mostly duplicate
# coverage from the other matrix jobs.
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Upload test results to Codecov
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion docs/guides/editor_features/ai_completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ To use Anthropic with marimo:

```toml title="marimo.toml"
[ai.open_ai]
model = "claude-3-5-sonnet-20240620"
model = "claude-3-7-sonnet-20250219"
# or any model from https://docs.anthropic.com/en/docs/about-claude/models

[ai.anthropic]
Expand Down
2 changes: 1 addition & 1 deletion examples/ai/chat/anthropic_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __(input_key, mo, os_key):
def __(key, mo):
chatbot = mo.ui.chat(
mo.ai.llm.anthropic(
"claude-3-5-sonnet-20240620",
"claude-3-7-sonnet-20250219",
system_message="You are a helpful assistant.",
api_key=key,
),
Expand Down
2 changes: 1 addition & 1 deletion examples/cloud/modal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ You can configure your GPU selection by editing `modal_edit`.
notebook as an app on Modal. Run with

```bash
uvx -p 3.12 modal run modal_run.py
uvx -p 3.12 modal run modal_app.py
```

5 changes: 4 additions & 1 deletion frontend/islands/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ export default defineConfig({
entryFileNames: "[name].js",
// Ensure CSS is output as style.css instead of frontend.css
assetFileNames: (assetInfo) => {
if (assetInfo.names.includes("frontend.css")) {
if (
assetInfo.names.includes("frontend.css") ||
assetInfo.names.includes("islands.css")
) {
return "style.css";
}
return assetInfo.names[0];
Expand Down
12 changes: 6 additions & 6 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
],
"dependencies": {
"@anywidget/types": "^0.2.0",
"@codemirror/autocomplete": "^6.18.4",
"@codemirror/autocomplete": "^6.18.6",
"@codemirror/commands": "^6.8.0",
"@codemirror/lang-markdown": "^6.3.2",
"@codemirror/lang-python": "^6.1.7",
"@codemirror/lang-sql": "^6.8.0",
"@codemirror/language": "^6.10.8",
"@codemirror/language-data": "^6.5.1",
"@codemirror/lint": "^6.8.4",
"@codemirror/search": "^6.5.8",
"@codemirror/search": "^6.5.10",
"@codemirror/state": "^6.5.2",
"@codemirror/theme-one-dark": "^6.1.2",
"@codemirror/view": "^6.36.2",
"@codemirror/view": "^6.36.4",
"@dagrejs/dagre": "^1.1.4",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
Expand All @@ -38,8 +38,8 @@
"@lezer/common": "^1.2.3",
"@lezer/highlight": "^1.2.1",
"@lezer/lr": "^1.4.2",
"@lezer/python": "^1.1.15",
"@marimo-team/codemirror-ai": "^0.1.7",
"@lezer/python": "^1.1.16",
"@marimo-team/codemirror-ai": "^0.1.9",
"@marimo-team/marimo-api": "file:../openapi",
"@marimo-team/react-slotz": "^0.1.8",
"@open-rpc/client-js": "^1.8.1",
Expand Down Expand Up @@ -80,7 +80,7 @@
"@types/jsdom": "^21.1.7",
"@types/react-grid-layout": "^1.3.5",
"@uidotdev/usehooks": "^2.4.1",
"@uiw/codemirror-extensions-langs": "^4.23.8",
"@uiw/codemirror-extensions-langs": "^4.23.10",
"@uiw/react-codemirror": "^4.23.8",
"@uwdata/flechette": "^1.1.2",
"@valtown/codemirror-codeium": "^1.1.1",
Expand Down
Loading

0 comments on commit a5c6d70

Please sign in to comment.