Skip to content

Search recs unstable merger #5005

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.

Sign up for GitHub

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

Jump to bottom
Merged
bjester merged 282 commits into from
Apr 17, 2025
Merged

Search recs unstable merger #5005

bjester merged 282 commits into from
Apr 17, 2025

Conversation

@akolson
Copy link
Member

@akolson akolson commented Apr 15, 2025 •
edited
Loading

Summary

This pr updates the search-recommendations feature branch with the latest from unstable, resolving conflicts in the process. It also cleans up the pgvector logic following a pivot in our approach.

References

NA

Reviewer guidance

  • Branch should run successfully

dependabot bot and others added 30 commits December 27, 2024 17:15
@dependabot
Bump jinja2 from 3.1.4 to 3.1.5
60120fe 
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@AlexVelezLl
Merge pull request learningequality#4864 from jayesh9747/unstable
a4ff3b6 
Hotfix: Centered the 'Show more' button in Import from other channels
@rtibbles
Do elementary file validation for image, video, and audio.
cc3364b
@rtibbles
Add predictable zip utility that gives identical MD5s to ricecooker's…
c7625e5 
… Python implementation.
@rtibbles
Fix html5 preview to honor entry option.
9e12b0b
@rtibbles
Add HTML5 validation and cleaning to denest folders and set alternate…
d400681 
… entry.
@dependabot
Bump virtualenv from 20.14.1 to 20.26.6
4d1b015 
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.14.1 to 20.26.6.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst)
- [Commits](pypa/virtualenv@20.14.1...20.26.6)

---
updated-dependencies:
- dependency-name: virtualenv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@Arunima22
Added Page=1 in the route.query when a new search term is introduced (l…
3b7e894 
…earningequality#4841)
@shruti862
Merge branch 'learningequality:unstable' into new-branch
e3d7acb
@shruti862
new change
0c9816e
@shruti862
new commit
c57cdb9
@shruti862
Merge branch 'new-branch' of github.com:shruti862/studio into new-branch
73b58e2
@shruti862
new commit
fb97997
@pre-commit-ci-lite
[pre-commit.ci lite] apply automatic fixes
b946b5a
@shruti862
suggested changes done
f618cc2
@shruti862
Merge branch 'new-branch' of github.com:shruti862/studio into new-branch
00e1f54
@shruti862
new commit
b6e3714
@pre-commit-ci-lite
[pre-commit.ci lite] apply automatic fixes
e1dce41
@rtibbles
Merge pull request learningequality#4867 from rtibbles/predictable_zips
c7a35be 
Simple file validation and HTML5 zip correction
@dependabot
Bump store2 from 2.14.3 to 2.14.4
53a2e65 
Bumps [store2](https://github.com/nbubna/store) from 2.14.3 to 2.14.4.
- [Commits](nbubna/store@2.14.3...2.14.4)

---
updated-dependencies:
- dependency-name: store2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull request learningequality#4561 from learningequality/depend…
de50838 
…abot/pip/celery-5.4.0

Bump celery from 5.2.7 to 5.4.0
@rtibbles
Merge pull request learningequality#4865 from learningequality/depend…
17b9215 
…abot/pip/jinja2-3.1.5

Bump jinja2 from 3.1.4 to 3.1.5
@dependabot
Bump pytest-django from 4.3.0 to 4.9.0
0ddbef5 
Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.3.0 to 4.9.0.
- [Release notes](https://github.com/pytest-dev/pytest-django/releases)
- [Changelog](https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst)
- [Commits](pytest-dev/pytest-django@v4.3.0...v4.9.0)

---
updated-dependencies:
- dependency-name: pytest-django
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump requests from 2.32.2 to 2.32.3
b22e5a8 
Bumps [requests](https://github.com/psf/requests) from 2.32.2 to 2.32.3.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.2...v2.32.3)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull request learningequality#4879 from learningequality/depend…
d497157 
…abot/npm_and_yarn/store2-2.14.4

Bump store2 from 2.14.3 to 2.14.4
@rtibbles
Merge pull request learningequality#4868 from learningequality/depend…
3359c04 
…abot/pip/virtualenv-20.26.6

Bump virtualenv from 20.14.1 to 20.26.6
@rtibbles
Update pythonpath setting in tests to use built in pytest option.
d32a977 
Remove pytest-pythonpath
@rtibbles
Merge pull request learningequality#4782 from learningequality/depend…
ebdc8c5 
…abot/pip/requests-2.32.3

Bump requests from 2.32.2 to 2.32.3
@rtibbles
Merge pull request learningequality#4855 from bjester/nginx-content-r…
f2b8f50 
…outing

nginx recursive content routing for non-production environments
@rtibbles
Merge pull request learningequality#4706 from learningequality/depend…
a9dd35e 
…abot/pip/pytest-django-4.9.0

Bump pytest-django from 4.3.0 to 4.9.0
rtibbles and others added 8 commits April 9, 2025 08:30
@rtibbles
Merge pull request learningequality#4997 from learningequality/depend…
f94598a 
…abot/pip/celery-5.5.1

Bump celery from 5.4.0 to 5.5.1
@rtibbles
Merge pull request learningequality#4998 from learningequality/depend…
9433038 
…abot/pip/sentry-sdk-2.25.1

Bump sentry-sdk from 2.25.0 to 2.25.1
@akolson
Merge pull request learningequality#4994 from AlexVelezLl/fix-un-inte…
945c6be 
…rpolated-scss-vars

Interpolate scss variables in calc functions
@nucleogenesis
raise rest_framework.ValidationError when lft is not an integer in Co…
8828359 
…ntentNodePagination
@akolson
Updates pillow version
6c2fc95
@akolson
Merge pull request learningequality#5002 from akolson/update-pillow-v…
8aea60a 
…ersion

Updates pillow version
@akolson
Merge branch 'unstable' into search-recs-unstable-merger
00a4f79
@akolson
Temporarily removes flake8 linting dependency
b8a216a
@akolson akolson requested a review from bjester April 15, 2025 20:35
@akolson akolson force-pushed the search-recs-unstable-merger branch from e087d43 to a728ec8 Compare April 15, 2025 21:05
@akolson
Copy link
Member Author

akolson commented Apr 16, 2025

@bjester — we touched on this briefly yesterday, but I dug in and discovered that the build failure is due to the issue I have addressed here. Once that PR is reviewed and merged, we can create a new release of le-utils, which should resolve the failure in this build.

bjester and others added 3 commits April 16, 2025 07:07
@bjester
Merge pull request learningequality#4993 from ozer550/fix-node-detail…
ab12eab 
…s-must-be-defined-error

Fix node details must be defined reference error
@nucleogenesis
remove user input from pagination error
0a2a718
@bjester
Merge pull request learningequality#4990 from nucleogenesis/lft-must-…
0a5bac7 
…be-int-error-improvement

raise rest_framework.ValidationError when lft is not an integer
@akolson akolson force-pushed the search-recs-unstable-merger branch from 639b2a4 to a728ec8 Compare April 17, 2025 15:01
@bjester bjester merged commit dfd92cd into learningequality:search-recommendations Apr 17, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjester bjester bjester approved these changes

Assignees

@bjester bjester

Labels

DEV: backend DEV: frontend TAG: new feature

Projects

None yet

Milestone

Studio Project: Search Recommendations

Development

Successfully merging this pull request may close these issues.