chore(core): rename wren-modeling to wren-core (#848)

* rename wren-modeling-rs to wren-core

* add missing file

.github/dependabot.yml

@@ -27,27 +27,27 @@ updates:
       - "python"
       - "ibis"
   - package-ecosystem: "pip"
-    directory: "/wren-modeling-py"
+    directory: "/wren-core-py"
     schedule:
       interval: "weekly"
     groups:
       all:
         patterns: [ "*" ]
     commit-message:
-      prefix: "chore(modeling-py-deps)"
+      prefix: "chore(core-py-deps)"
     labels:
       - "dependencies"
       - "python"
   - package-ecosystem: "cargo"
-    directory: "/wren-modeling-rs"
+    directory: "/wren-core"
     schedule:
       interval: "weekly"
     groups:
       all:
         patterns: [ "*" ]
     commit-message:
-      prefix: "chore(modeling-rs-deps)"
+      prefix: "chore(core-deps)"
     labels:
       - "dependencies"
-      - "modeling-rs"
+      - "core"
       - "rust"

.github/labeler.yml

@@ -8,15 +8,15 @@ dependencies:
 
 python:
 - changed-files:
-  - any-glob-to-any-file: ['ibis-server/**', 'wren-modeling-py/**']
+  - any-glob-to-any-file: ['ibis-server/**', 'wren-core-py/**']
 
 rust:
 - changed-files:
-  - any-glob-to-any-file: ['wren-modeling-rs/**']
+  - any-glob-to-any-file: ['wren-core/**']
 
 core:
 - changed-files:
-  - any-glob-to-any-file: ['wren-modeling-rs/**']
+  - any-glob-to-any-file: ['wren-core/**']
 
 documentation:
 - changed-files:

.github/workflows/build-dev-image.yml

@@ -84,8 +84,8 @@ jobs:
         with:
           context: ./ibis-server
           build-contexts: |
-            wren-modeling-py=./wren-modeling-py
-            wren-modeling-rs=./wren-modeling-rs
+            wren-core-py=./wren-core-py
+            wren-core=./wren-core
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/build-image.yml

@@ -96,8 +96,8 @@ jobs:
         with:
           context: ./ibis-server
           build-contexts: |
-            wren-modeling-py=./wren-modeling-py
-            wren-modeling-rs=./wren-modeling-rs
+            wren-core-py=./wren-core-py
+            wren-core=./wren-core
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/modeling-py-ci.yml → .github/workflows/core-py-ci.yml

@@ -1,14 +1,14 @@
-name: Modeling Python CI
+name: Core Python CI
 
 on:
   pull_request:
     paths:
-      - 'wren-modeling-py/**'
-      - 'wren-modeling-rs/**'
+      - 'wren-core-py/**'
+      - 'wren-core/**'
 
 defaults:
   run:
-    working-directory: wren-modeling-py
+    working-directory: wren-core-py
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}
@@ -30,7 +30,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            ./wren-modeling-py/target/
+            ./wren-core-py/target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install poetry
         run: pipx install poetry

.github/workflows/modeling-py-mult-platform-ci.yml → .github/workflows/core-py-mult-platform-ci.yml

@@ -3,7 +3,7 @@
 #
 #    maturin generate-ci --pytest github
 #
-name: Modeling Python CI (multi-platform)
+name: Core Python CI (multi-platform)
 
 # We don't ready to run this workflow on stable release flow yet
 on:
@@ -39,7 +39,7 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          working-directory: wren-modeling-py
+          working-directory: wren-core-py
           target: ${{ matrix.platform.target }}
           args: -o dist --find-interpreter
           sccache: 'true'
@@ -49,10 +49,10 @@ jobs:
         shell: bash
         run: |
           set -e
-          cd wren-modeling-py
+          cd wren-core-py
           python3 -m venv .venv
           source .venv/bin/activate
-          pip install wren-modeling-py --find-links dist --force-reinstall
+          pip install wren-core-py --find-links dist --force-reinstall
           pip install pytest
           pytest
       - name: pytest
@@ -68,8 +68,8 @@ jobs:
             pip3 install -U pip pytest
           run: |
             set -e
-            cd wren-modeling-py
-            pip3 install wren-modeling-py --find-links dist --force-reinstall
+            cd wren-core-py
+            pip3 install wren-core-py --find-links dist --force-reinstall
             pytest
 
   musllinux:
@@ -93,7 +93,7 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          working-directory: wren-modeling-py
+          working-directory: wren-core-py
           target: ${{ matrix.platform.target }}
           args: -o dist --find-interpreter
           sccache: 'true'
@@ -107,10 +107,10 @@ jobs:
           run: |
             set -e
             apk add py3-pip py3-virtualenv
-            cd wren-modeling-py
+            cd wren-core-py
             python3 -m virtualenv .venv
             source .venv/bin/activate
-            pip install wren-modeling-py --no-index --find-links dist --force-reinstall
+            pip install wren-core-py --no-index --find-links dist --force-reinstall
             pip install pytest
             pytest
       - name: pytest
@@ -124,11 +124,11 @@ jobs:
             apk add py3-virtualenv
           run: |
             set -e
-            cd wren-modeling-py
+            cd wren-core-py
             python3 -m virtualenv .venv
             source .venv/bin/activate
             pip install pytest
-            pip install wren-modeling-py --find-links dist --force-reinstall
+            pip install wren-core-py --find-links dist --force-reinstall
             pytest
 
   windows:
@@ -149,7 +149,7 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          working-directory: wren-modeling-py
+          working-directory: wren-core-py
           target: ${{ matrix.platform.target }}
           args: -o dist --find-interpreter
           sccache: 'true'
@@ -158,10 +158,10 @@ jobs:
         shell: bash
         run: |
           set -e
-          cd wren-modeling-py
+          cd wren-core-py
           python3 -m venv .venv
           source .venv/Scripts/activate
-          pip install wren-modeling-py --find-links dist --force-reinstall
+          pip install wren-core-py --find-links dist --force-reinstall
           pip install pytest
           pytest
 
@@ -182,16 +182,16 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          working-directory: wren-modeling-py
+          working-directory: wren-core-py
           target: ${{ matrix.platform.target }}
           args: -o dist --find-interpreter
           sccache: 'true'
       - name: pytest
         run: |
           set -e
-          cd wren-modeling-py
+          cd wren-core-py
           python3 -m venv .venv
           source .venv/bin/activate
-          pip install wren-modeling-py --find-links dist --force-reinstall
+          pip install wren-core-py --find-links dist --force-reinstall
           pip install pytest
           pytest

.github/workflows/ibis-ci.yml

@@ -52,8 +52,8 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            wren-modeling-py/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('wren-modeling-py/Cargo.lock') }}
+            wren-core-py/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('wren-core-py/Cargo.lock') }}
       - name: Install FreeTDS to be a ODBC driver
         run: |
           sudo apt-get update -y && sudo apt-get install -y unixodbc-dev freetds-dev tdsodbc

.github/workflows/rust.yml

@@ -3,15 +3,15 @@ name: Rust
 on:
   pull_request:
     paths:
-      - 'wren-modeling-rs/**'
+      - 'wren-core/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
 
 defaults:
   run:
-    working-directory: wren-modeling-rs
+    working-directory: wren-core
 
 jobs:
   # Check crate compiles
@@ -35,9 +35,9 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            ./wren-modeling-rs/target/
+            ./wren-core/target/
           # this key equals the ones on `linux-build-lib` for re-use
-          key: cargo-cache-benchmark-${{ hashFiles('wren-modeling-rs/Cargo.toml') }}
+          key: cargo-cache-benchmark-${{ hashFiles('wren-core/Cargo.toml') }}
 
       - name: Check datafusion-common without default features
         run: cargo check --all-targets

.github/workflows/stable-release.yml

@@ -143,8 +143,8 @@ jobs:
           build-args: |
             RUST_PROFILE=--release
           build-contexts: |
-            wren-modeling-py=./wren-modeling-py
-            wren-modeling-rs=./wren-modeling-rs
+            wren-core-py=./wren-core-py
+            wren-core=./wren-core
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

ibis-server/Dockerfile

@@ -24,8 +24,8 @@ ENV PYTHONUNBUFFERED=1 \
 
 RUN pip install poetry==1.8.3
 
-COPY --from=wren-modeling-py . /wren-modeling-py
-COPY --from=wren-modeling-rs . /wren-modeling-rs
+COPY --from=wren-core-py . /wren-core-py
+COPY --from=wren-core . /wren-core
 
 WORKDIR /app
 COPY . .

ibis-server/README.md

@@ -6,8 +6,8 @@ We continuously integrate the Rust core with the Ibis server now.
 ## Application structure
 The application consists of three main parts:
 1. [ibis-server](./): a Python web server powered by FastAPI and Ibis
-2. [wren-modeling-rs](../wren-modeling-rs): a modeling core written in Rust powered by [Apache DataFusion](https://github.com/apache/datafusion)
-3. [wren-modeling-py](../wren-modeling-py): a Python adapter for the modeling core
+2. [wren-core](../wren-cores): a modeling core written in Rust powered by [Apache DataFusion](https://github.com/apache/datafusion)
+3. [wren-core-py](../wren-core-py): a Python adapter for the modeling core
 
 ## Quick Start
 

ibis-server/justfile

@@ -2,9 +2,9 @@ default:
     @just --list --unsorted
 
 build-core *args:
-    cd ../wren-modeling-py && just install && just build {{args}}
+    cd ../wren-core-py && just install && just build {{args}}
 
-core-wheel-path := "../wren-modeling-py/target/wheels/wren_modeling_py-*.whl"
+core-wheel-path := "../wren-core-py/target/wheels/wren_core_py-*.whl"
 
 install-core *args:
     just build-core {{args}}
@@ -36,8 +36,8 @@ docker-build:
 # alias for `docker-build`
 dbuild:
     docker buildx build -t wren-engine-ibis -f Dockerfile \
-        --build-context wren-modeling-py=../wren-modeling-py \
-        --build-context wren-modeling-rs=../wren-modeling-rs \
+        --build-context wren-core-py=../wren-core-py \
+        --build-context wren-core=../wren-core \
         .
 
 docker-run:

wren-modeling-py/Cargo.toml → wren-core-py/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
-name = "wren-modeling-py"
+name = "wren-core-py"
 version = "0.1.0"
 edition = "2021"
 include = ["/src", "pyproject.toml", "Cargo.toml", "Cargo.lock"]
 
 [lib]
-name = "wren_modeling_py"
+name = "wren_core_py"
 crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.21.2", features = [
   "extension-module",
   "generate-import-lib",
 ] }
-wren-core = { path = "../wren-modeling-rs/core" }
+wren-core = { path = "../wren-core/core" }
 base64 = "0.22.1"
 serde_json = "1.0.117"
 thiserror = "1.0"

wren-modeling-py/README.md → wren-core-py/README.md

@@ -1,5 +1,5 @@
-# Wren Modeling Core in Python
-Here is a dependency package for Python. It is a wrapper for the Rust package [wren-modeling-rs](../wren-modeling-rs). The Rust package is compiled to a Python package and can be used in Python.
+# Wren Core in Python
+Here is a dependency package for Python. It is a wrapper for the Rust package [wren-core](../wren-core). The Rust package is compiled to a Python package and can be used in Python.
 
 ## Developer Guide
 

wren-modeling-py/pyproject.toml → wren-core-py/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
-name = "wren-modeling-py"
+name = "wren-core-py"
 classifiers = ["Programming Language :: Python :: 3.11"]
 
 [tool.poetry]
-name = "wren-modeling-py"
+name = "wren-core-py"
 version = "0.1.0"
 description = ""
 authors = ["Canner <[email protected]>"]

wren-modeling-rs/README.md → wren-core/README.md

@@ -1,4 +1,4 @@
-# Modeling Module
+# Wren Core Module
 
 This is just a very early version of transforming SQL with DataFusion. The main program is a simple use case demonstrating how to use the mdl library.
 

wren-modeling-rs/core/Cargo.toml → wren-core/core/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/lib.rs"
 [dependencies]
 async-trait = { workspace = true }
 csv = "1.3.0"
-datafusion = { workspace = true, default-features = false, features = [
+datafusion = { workspace = true, features = [
     "nested_expressions",
     "crypto_expressions",
     "datetime_expressions",