Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add deepsearch-toolkit docling-ibm-models docling-parse docling-core mean-average-precision #28091

Merged
merged 23 commits into from
Nov 11, 2024

Conversation

hadim
Copy link
Member

@hadim hadim commented Nov 3, 2024

Checklist

  • Title of this PR is meaningful: e.g. "Adding my_nifty_package", not "updated meta.yaml".
  • License file is packaged (see here for an example).
  • Source is from official source.
  • Package does not vendor other packages. (If a package uses the source of another package, they should be separate packages or the licenses of all packages need to be packaged).
  • If static libraries are linked in, the license of the static library is packaged.
  • Package does not ship static libraries. If static libraries are needed, follow CFEP-18.
  • Build number is 0.
  • A tarball (url) rather than a repo (e.g. git_url) is used in your recipe (see here for more details).
  • GitHub users listed in the maintainer section have posted a comment confirming they are willing to be listed there.
  • When in trouble, please check our knowledge base documentation before pinging a team.

Copy link

github-actions bot commented Nov 3, 2024

Hi! This is the staged-recipes linter and I found some lint.

It looks like some changes were made outside the recipes/ directory. To ensure everything runs smoothly, please make sure that recipes are only added to the recipes/ directory and no other files are changed.

If these changes are intentional (and you aren't submitting a recipe), please add a maintenance label to the PR.

File-specific lints and/or hints:

  • broken-recipes/.gitignore:

    • lints:
      • Do not edit files outside of the recipes/ directory.
  • broken-recipes/inplace-abn/meta.yaml:

    • lints:
      • Do not edit files outside of the recipes/ directory.
  • broken-recipes/inplace-abn/build.sh:

    • lints:
      • Do not edit files outside of the recipes/ directory.
  • .scripts/run_docker_build.sh:

    • lints:
      • Do not edit files outside of the recipes/ directory.

@hadim
Copy link
Member Author

hadim commented Nov 3, 2024

Those are needed to package docling and deepsearch-glm but those two will come in different PRs as they are harder to package.

@conda-forge-admin
Copy link
Contributor

conda-forge-admin commented Nov 3, 2024

Hi! This is the friendly automated conda-forge-linting service.

I failed to even lint the recipe, probably because of a conda-smithy bug 😢. This likely indicates a problem in your meta.yaml, though. To get a traceback to help figure out what's going on, install conda-smithy and run conda smithy recipe-lint --conda-forge . from the recipe directory.

This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/11654600025.

Copy link

github-actions bot commented Nov 3, 2024

Hi! This is the staged-recipes linter and your PR looks excellent! 🚀

@conda-forge-admin
Copy link
Contributor

conda-forge-admin commented Nov 3, 2024

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipes/deepsearch-toolkit/recipe.yaml, recipes/mean-average-precision/recipe.yaml, recipes/docling-parse/recipe.yaml, recipes/docling-core/recipe.yaml, recipes/docling-ibm-models/recipe.yaml) and found it was in an excellent condition.

@hadim hadim changed the title add deepsearch-toolkit docling-ibm-models docling-parse loguru-cpp docling-core mean-average-precision add deepsearch-toolkit docling-ibm-models docling-parse docling-core mean-average-precision Nov 3, 2024
@hadim
Copy link
Member Author

hadim commented Nov 3, 2024

blocked by #28092

@hadim hadim marked this pull request as draft November 3, 2024 21:29
@hadim hadim mentioned this pull request Nov 3, 2024
10 tasks
@hadim
Copy link
Member Author

hadim commented Nov 5, 2024

I am seeing error related to missing python_min during the build. Is it because CEFP25 is not yet ready (conda-forge/conda-forge.github.io#2355)?

I can see python_min defined at https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml, but I don't know whether it is used in staged-recipes.

Adding in variants from /home/conda/staged-recipes-copy/.ci_support/linux64.yaml
Error:   × Failed to parse recipe

Error:   × Parsing: failed to parse match spec: Unable to parse version spec: .*
    ╭─[23:7]
 22 │   host:
 23 │     - python ${{ python_min }}.*
    ·       ─────────────┬────────────
    ·                    ╰── error parsing `python .*` as a match spec
 24 │     - poetry-core
    ╰────
Error:   × Parsing: failed to parse match spec: Unable to parse version spec: >=
    ╭─[27:7]
 26 │   run:
 27 │     - python >=${{ python_min }}
    ·       ─────────────┬────────────
    ·                    ╰── error parsing `python >=` as a match spec
 28 │     - urllib3 >=1.26.8
    ╰────

Sorry for the ping @beckermr but since you are the author of the various CEFP25 PRs, you might want to be aware of this.

Or maybe it's due to rattler-build?

Copy link

github-actions bot commented Nov 5, 2024

Hi! This is the staged-recipes linter and I found some lint.

It looks like some changes were made outside the recipes/ directory. To ensure everything runs smoothly, please make sure that recipes are only added to the recipes/ directory and no other files are changed.

If these changes are intentional (and you aren't submitting a recipe), please add a maintenance label to the PR.

File-specific lints and/or hints:

  • .scripts/run_osx_build.sh:
    • lints:
      • Do not edit files outside of the recipes/ directory.

@beckermr
Copy link
Member

beckermr commented Nov 5, 2024

I am taking a look.

@hadim
Copy link
Member Author

hadim commented Nov 5, 2024

Note that the builds will fail anyway cuz of missing #28092.

@beckermr
Copy link
Member

beckermr commented Nov 5, 2024

the variable python_min is in the pinnings and rattler-build says it is loading it. I'd say unless we can reproduce with conda-build, this is a rattler bug.

@hadim
Copy link
Member Author

hadim commented Nov 5, 2024

I can reproduce this minimally indeed:

  • recipe.yaml
context:
  name: mean-average-precision
  version: 2024.01.05.0

package:
  name: ${{ name|lower }}
  version: ${{ version }}

build:
  script: echo ${{ python_min }}

requirements:
  host:
    - python ${{ python_min }}.*
  run:
    - python >=${{ python_min }}
  • config.yaml
python_min:
  # minimum supported python version per CFEP-25
  # bump to next minor version when we drop python versions
  - '3.9'
  • Error:
❯ rattler-build build -m config.yaml -r recipe.yaml --render-only --output-dir /tmp/rattler_output
Error:   × Failed to parse recipe

Error:   × Parsing: failed to parse match spec: Unable to parse version spec: .*
    ╭─[14:7]
 13 │   host:
 14 │     - python ${{ python_min }}.*
    ·       ─────────────┬────────────
    ·                    ╰── error parsing `python .*` as a match spec
 15 │   run:
    ╰────
Error:   × Parsing: failed to parse match spec: Unable to parse version spec: >=
    ╭─[16:7]
 15 │   run:
 16 │     - python >=${{ python_min }}
    ·       ─────────────┬────────────
    ·                    ╰── error parsing `python >=` as a match spec
    ╰────

@wolfv is there is something obvious I am missing here or should I report this as a bug on the rattler-build repo?

@wolfv
Copy link
Member

wolfv commented Nov 5, 2024

Yeah that's unfortunately a bug that we have to fix. I have made some preliminary work in prefix-dev/rattler-build#1122 that better splits the two rendering phases:

  • first find all unknown Jinja vars and render them out
  • then render all expressions

@hadim
Copy link
Member Author

hadim commented Nov 5, 2024

Yeah that's unfortunately a bug that we have to fix. I have made some preliminary work in prefix-dev/rattler-build#1122 that better splits the two rendering phases:

  • first find all unknown Jinja vars and render them out
  • then render all expressions

Ok. Thanks for the input. I will hard-code it for now, waiting for rattler-build to support it.

@hadim
Copy link
Member Author

hadim commented Nov 6, 2024

@conda-forge/help-python @conda-forge/help-python-c ready for review.

  • The failure on Windows is due to a missing pytorch.
  • The lint error python ={{ python_min }} is a false positive, since with rattler-build we use python ${{ python_min }}.* instead of python {{ python_min }}.*.

@beckermr pinging you as you might want to be aware about the python_min linting false positive cuz of rattler-build.

@beckermr
Copy link
Member

beckermr commented Nov 6, 2024

Thanks for the bump. I will fix.

@hadim hadim closed this Nov 7, 2024
@hadim hadim reopened this Nov 7, 2024
@hadim hadim closed this Nov 7, 2024
@hadim hadim reopened this Nov 7, 2024
@hadim
Copy link
Member Author

hadim commented Nov 7, 2024

@conda-forge/help-python @conda-forge/help-python-c, ready for review.

This is blocking for #28093

The windows' failure is due to missing pytorch.

@hadim
Copy link
Member Author

hadim commented Nov 8, 2024

@conda-forge/help-python @conda-forge/help-python-c, let me know if you prefer to break down this PR into smaller ones.

@hadim
Copy link
Member Author

hadim commented Nov 11, 2024

@beckermr @wolfv can I ask one of you to be my hero here?

@beckermr beckermr merged commit ef82706 into conda-forge:main Nov 11, 2024
5 of 7 checks passed
@hadim hadim deleted the docling branch November 11, 2024 15:12
@hadim
Copy link
Member Author

hadim commented Nov 11, 2024

Thank you @beckermr !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants