Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7b45d2d
Discard the deprecated `build_multi_table_dictionary` API function
popescu-v Mar 11, 2025
9b530fd
Update Core API to v11
popescu-v Mar 11, 2025
919f9a9
Add missing "technical" arguments to `simplify_coclustering`
popescu-v Mar 11, 2025
f6615aa
Only delete log if not user-provided in `detect_data_table_format`
popescu-v Mar 11, 2025
648eee8
Add `interpret_predictor` Core API function and samples
popescu-v Mar 11, 2025
88ba4d5
Add `train_instance_variable_coclustering` API function and sample
popescu-v Mar 11, 2025
53ef72c
Add '/'-based secondary-table data-path convention support in diction…
popescu-v Mar 11, 2025
3316b81
Update Core samples documentation and notebook files
popescu-v Mar 11, 2025
31c9ad4
Drop legacy test references for older Khiops versions
popescu-v Mar 11, 2025
7b893bf
Set `KHIOPS_API_MODE` to true on local runner initialization
popescu-v Mar 11, 2025
6539039
Update Core helper function according to the v11 Core API
popescu-v Mar 11, 2025
e1db048
Fail early on instance-variable coclustering deployment attempt
popescu-v Mar 11, 2025
34f529a
Drop deprecated tuple and sequence dataset spec
popescu-v Mar 11, 2025
5be96b6
Drop deprecated file-based datasets
popescu-v Mar 11, 2025
0a2c960
Update sklearn tests
popescu-v Mar 11, 2025
581fb1f
Update sklearn code to v11
popescu-v Mar 11, 2025
5e70ce0
Only keep models starting with specified model prefix (SNB_)
popescu-v Mar 11, 2025
17fdb7f
End path statements with comments in scenarios
popescu-v Mar 17, 2025
ec8b621
Update the Conda package release workflow to account for the new Cond…
popescu-v Feb 6, 2025
cc7c3b1
Update to CI to the latest Khiops core beta (10.6.0-b.0)
popescu-v Mar 11, 2025
691b4b7
Display and archive test reports even in case of failures
popescu-v Mar 11, 2025
c624616
Pin khiops-core Conda dependency to current v11 beta (10.6.0b.0)
popescu-v Mar 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
type: boolean
default: false
image-tag:
default: latest
default: 10.6.0-b.0.0
description: Development Docker Image Tag
pull_request:
paths:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || 'latest' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.6.0-b.0.0' }}
# Use the 'runner' user (1001) from github so checkout actions work properly
# https://github.com/actions/runner/issues/2033#issuecomment-1598547465
options: --user 1001
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Conda Package
env:
# Note: The default Khiops version must never be an alpha release as they are
# ephemeral. To test alpha versions run the workflow manually.
DEFAULT_KHIOPS_CORE_VERSION: 10.2.4
DEFAULT_KHIOPS_CORE_VERSION: 10.6.0b.0
DEFAULT_SAMPLES_VERSION: 10.2.4
on:
workflow_dispatch:
inputs:
khiops-core-version:
default: 10.2.4
default: 10.6.0b.0
description: khiops-core version for testing
khiops-samples-version:
default: 10.2.4
Expand Down Expand Up @@ -240,9 +240,9 @@ jobs:
if [[ "$ANACONDA_CHANNEL" == "khiops" ]]
then
anaconda --token "${{ secrets.KHIOPS_ANACONDA_CHANNEL_TOKEN }}" upload \
--user "$ANACONDA_CHANNEL" ./khiops-conda/noarch/*.tar.bz2
--user "$ANACONDA_CHANNEL" ./khiops-conda/noarch/*.conda
# For the dev channel: upload with forcing
else
anaconda --token "${{ secrets.KHIOPS_DEV_ANACONDA_CHANNEL_TOKEN }}" upload \
--user "$ANACONDA_CHANNEL" --force ./khiops-conda/noarch/*.tar.bz2
--user "$ANACONDA_CHANNEL" --force ./khiops-conda/noarch/*.conda
fi
4 changes: 2 additions & 2 deletions .github/workflows/dev-docker.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Dev Docker
env:
DEFAULT_KHIOPS_REVISION: 10.2.4
DEFAULT_KHIOPS_REVISION: 10.6.0-b.0
DEFAULT_IMAGE_INCREMENT: 0
DEFAULT_SERVER_REVISION: main
DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12 3.13
Expand All @@ -14,7 +14,7 @@ on:
inputs:
khiops-revision:
type: string
default: 10.2.4
default: 10.6.0-b.0
description: Khiops Revision
image-increment:
type: number
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
default: 10.2.4
description: khiops-samples repo revision
image-tag:
default: latest
default: 10.6.0-b.0.0
description: Development Docker Image Tag
pull_request:
paths:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || 'latest' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.6.0-b.0.0' }}
steps:
- name: Set parameters as env
run: |
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
name: Tests
env:
DEFAULT_SAMPLES_REVISION: 10.2.4
DEFAULT_KHIOPS_DESKTOP_REVISION: 10.2.4
DEFAULT_KHIOPS_DESKTOP_REVISION: 10.6.0-b.0
on:
workflow_dispatch:
inputs:
samples-revision:
default: 10.2.4
description: Git Tag/Branch/Commit for the khiops-samples Repo
image-tag:
default: latest
default: 10.6.0-b.0.0
description: Development Docker Image Tag
khiops-desktop-revision:
default: 10.2.4
default: 10.6.0-b.0
description: Khiops Windows Desktop Application Version
run-expensive-tests:
type: boolean
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || 'latest' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.6.0-b.0.0' }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -184,6 +184,7 @@ jobs:
$CONDA run --no-capture-output -n "$CONDA_ENV" coverage xml -o "reports/$CONDA_ENV/py-coverage.xml"
done
- name: Display Test Reports
if: success() || failure()
uses: dorny/test-reporter@v1
with:
name: Run Tests ${{ matrix.python-version }}
Expand All @@ -192,7 +193,9 @@ jobs:
reports/py${{ matrix.python-version }}_conda/TEST-tests.*.*.xml
reporter: java-junit
path-replace-backslashes: 'true' # Necessary for windows paths
fail-on-error: 'false'
- name: Upload Test Reports as Artifacts
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: test-reports-${{ matrix.python-version }}
Expand Down Expand Up @@ -312,7 +315,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || 'latest' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.6.0-b.0.0' }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down
18 changes: 9 additions & 9 deletions doc/multi_table_primer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ The functions in `khiops.core` that allow using multi-table datasets have the op
``additional_data_tables``. This dictionary links the secondary tables to their data file paths and
it's indexed by their **data paths** which are specified as the regular expression::

root_table_name(`table_variable_name)*
(/external_entity_table_name)?(/table_variable_name)*

Specifically:

- the data path for a root table is its name
- the data path for a secondary table is composed of the name of its source root table followed by
the chain of *table variable* names leading to it. The path parts are separated by a backtick
`````.
- the data path for an *external entity* table (see below) is its name, preceded by a forward slash
- the data path for a secondary table is composed of the data path of its source root table if it
is an external entity table followed by the chain of *table variable* names leading to it.
The path parts are separated by a forward slash ``/``.

Types of secondary tables include:

Expand Down Expand Up @@ -279,7 +279,7 @@ In this case the ``additional_data_tables`` argument consists of only one path:
secondary table ``Vehicle``. Since it is pointed by the main table ``Accident`` via the table
variable ``Vehicle`` the ``additional_data_tables`` parameter should be set as::

additional_data_tables = {"Accident`Vehicles": f"{kh.get_samples_dir()}/Vehicles.txt"}
additional_data_tables = {"Vehicles": f"{kh.get_samples_dir()}/Vehicles.txt"}


Snowflake Schema
Expand Down Expand Up @@ -348,8 +348,8 @@ This time, the relational schema is as follows:
The ``additional_data_tables`` parameter must be set as::

additional_data_tables = {
"Accident`Place": "/path/to/Places.txt",
"Accident`Vehicles": "/path/to/Vehicles.txt",
"Accident`Vehicles`Users": "/path/to/Users.txt"
"Place": "/path/to/Places.txt",
"Vehicles": "/path/to/Vehicles.txt",
"Vehicles/Users": "/path/to/Users.txt"
}

Loading
Loading