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

Correctly resolve custom host and port with server resources #13041

Merged
merged 7 commits into from Apr 5, 2023

Conversation

mattpap
Copy link
Contributor

@mattpap mattpap commented Mar 31, 2023

The solution works and allows to correctly resolve host/port with server resources. The only issue is with handling all the incidental complexity around resources.

fixes #12400

@mattpap mattpap added this to the 3.2 milestone Mar 31, 2023
@codecov
Copy link

codecov bot commented Mar 31, 2023

Codecov Report

Merging #13041 (fb8caca) into branch-3.2 (08e5217) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@              Coverage Diff               @@
##           branch-3.2   #13041      +/-   ##
==============================================
- Coverage       92.35%   92.35%   -0.01%     
==============================================
  Files             315      315              
  Lines           19969    19961       -8     
==============================================
- Hits            18443    18435       -8     
  Misses           1526     1526              

src/bokeh/embed/bundle.py Outdated Show resolved Hide resolved
@mattpap mattpap force-pushed the mattpap/12400_server_resources_port branch from 4ca9648 to c99b5fe Compare April 1, 2023 12:43
Copy link
Member

@bryevdv bryevdv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, only a few comments

docs/bokeh/source/docs/releases/3.2.0.rst Outdated Show resolved Hide resolved
src/bokeh/embed/bundle.py Show resolved Hide resolved
src/bokeh/embed/bundle.py Outdated Show resolved Hide resolved
src/bokeh/embed/bundle.py Show resolved Hide resolved
@mattpap mattpap force-pushed the mattpap/12400_server_resources_port branch from cab5235 to 74fa5e2 Compare April 4, 2023 20:49
Allows to specify:

BOKEH_DEV=true BOKEH_RESOURCES=server python ...

instead of:

BOKEH_DEV=true BOKEH_RESOURCES=server-dev python ...
@mattpap mattpap force-pushed the mattpap/12400_server_resources_port branch from 74fa5e2 to fb8caca Compare April 5, 2023 10:48
@mattpap
Copy link
Contributor Author

mattpap commented Apr 5, 2023

Tests are failing due to #13056.

@mattpap mattpap merged commit 7b38904 into branch-3.2 Apr 5, 2023
25 of 27 checks passed
@mattpap mattpap deleted the mattpap/12400_server_resources_port branch April 5, 2023 11:37
mattpap added a commit that referenced this pull request Apr 5, 2023
mattpap added a commit that referenced this pull request Apr 5, 2023
mattpap added a commit that referenced this pull request Apr 6, 2023
mattpap added a commit that referenced this pull request Apr 6, 2023
mattpap added a commit that referenced this pull request Apr 6, 2023
mattpap added a commit that referenced this pull request Apr 11, 2023
mattpap added a commit that referenced this pull request Apr 17, 2023
* Fix MultiRootStaticHandler after PR #13041

* Work around unawaited async function calls
@bryevdv bryevdv modified the milestones: 3.2, 3.1.1 May 3, 2023
bryevdv pushed a commit that referenced this pull request May 3, 2023
* Correctly resolve custom host and port with server resources

* Use pathlib.Path instead of a comment

* Fix argument types in _bundle_extensions()

* Remove support for BaseResources

* Add a release note

* Add support for Resources.clone()

* Include settings.dev in Resources.dev

Allows to specify:

BOKEH_DEV=true BOKEH_RESOURCES=server python ...

instead of:

BOKEH_DEV=true BOKEH_RESOURCES=server-dev python ...
bryevdv pushed a commit that referenced this pull request May 3, 2023
* Fix MultiRootStaticHandler after PR #13041

* Work around unawaited async function calls
bryevdv pushed a commit that referenced this pull request May 3, 2023
@bryevdv bryevdv mentioned this pull request May 3, 2023
mattpap added a commit that referenced this pull request May 4, 2023
* Fix tiny error in doc code-block (#12973)

* Add a ref for LegendLocation (#12939)

* Temporarily disable docker_from_wheel test in CI (#12963)

* Update In-kind sponsors list (#13054)

* Update In-kind sponsors list

* Update README.md

* Update first_steps_1.rst (#13084)

* Update first_steps_1.rst

* Update docs/bokeh/source/docs/first_steps/first_steps_1.rst

Co-authored-by: Timo Cornelius Metzger <39711796+tcmetzger@users.noreply.github.com>

* Update first_steps_1.rst

Made the changes suggested!

* Update docs/bokeh/source/docs/first_steps/first_steps_1.rst

Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* Update first_steps_1.rst

Follow up edits

---------

Co-authored-by: Timo Cornelius Metzger <39711796+tcmetzger@users.noreply.github.com>
Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* Allow `static/` symlinks in `BOKEH_ACTION=install pip install -e .` (#13065)

* Disable user select globally when dragging slider handles (#13082)

* Add tests for custom arrayable functions (#12892)

* Add tests for custom arrayable functions

* add more tests for arrayable

* fix ESLint error

* fix another ESLint error

* List installed software and versions in CI (#12899)

* List installed software in CI

* Don't require npm@8, install most recent one

* Allow to correctly sort international strings in DataTable (#12900)

* Don't assign model's name to HTMLElement.name (#12901)

* Use CSS-safe IDs in generated HTML (#12902)

* Use CSS-safe IDs in generated HTML

* Generate DOM elements with unique IDs in load_notebook()

* Don't double stroke in diagonal hatch patterns (#12903)

* Add bokehjs example for grid band patterns

* Don't double stroke in diagonal hatch patterns

* Update visual baselines

* updated commands with correct links to executable (#12910)

changed examples/app/slider.py to examples/server/app/sliders.py 

transform_markers.py is updated here but shows as marker_map here
https://docs.bokeh.org/en/latest/docs/dev_guide/setup.html

* Copy files if symlinking fails in 'pack' build task (#12928)

* Document lack of serialization support for decimal.Decimal under Serializer class (#12935)

* Add message in Serializer docstring addressing lack of support for decimal.Decimal.

* Remove trailing whitespace

* Remove trailing whitespace

* Delete test file

* Upload latest docs more cleanly (#12955)

* Upload latest docs more cleanly

* Missing return type

* Check for git tags before build (#12962)

* Check for git tags during build

* Update setup.py

Co-authored-by: Mateusz Paprocki <mattpap@gmail.com>

---------

Co-authored-by: Mateusz Paprocki <mattpap@gmail.com>

* Added troubleshooting for issue #13001 (#13002)

* Added troubleshooting for issue #13001

* update

* updated ReadMe file of examples folder (#13066)

* updated ReadMe file of examples folder

* Update examples/README.md

Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* Update examples/README.md

Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* Update examples/README.md

Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* removed intergration section from readme

* added linebreaks

* fixed widespace issues

* trimmed trailing widespace

---------

Co-authored-by: Bryan Van de Ven <bryan@bokeh.org>

* Fix race conditions related to layout resize and updates (#13100)

* Fix a race condition between plot and canvas resize

* Ignore child model/view state inconsistencies for now

* Notify ready after render and layout is done

* Add a regression test for issue #13104

* manual eslint patch

* Make autocompleteinput.py example work with Pandas 2.0 (#13057)

* fix baseline

* Added metadata to line_on_off.py (#13003)

* Added metadata to line_on_off.py

* update

* update

* update

* update

* Tile source metadata (#13026)

* added accessible color palette

* Delete latex_schrodinger.png

* Delete latex_schrodinger@2x.png

* Add new thumbnails for updated palette

* Add metadata to text.py

* Revert changes from ths branch

* Update tile_source.py

* fix consistency & linter issues

* fix broken docs refs (#13086)

* fix broken docs refs

* pin sphinx to 5.3

* sphinx pin for 3.8

* Use libmamba solver in CI (#13061)

* Use libmamba solver in CI

* Disable "Post prepare environment" on Windows

* Correctly resolve custom host and port with server resources (#13041)

* Correctly resolve custom host and port with server resources

* Use pathlib.Path instead of a comment

* Fix argument types in _bundle_extensions()

* Remove support for BaseResources

* Add a release note

* Add support for Resources.clone()

* Include settings.dev in Resources.dev

Allows to specify:

BOKEH_DEV=true BOKEH_RESOURCES=server python ...

instead of:

BOKEH_DEV=true BOKEH_RESOURCES=server-dev python ...

* Fix `MultiRootStaticHandler` after PR #13041 (#13070)

* Fix MultiRootStaticHandler after PR #13041

* Work around unawaited async function calls

* Fix bokeh.sphinxext.util after PR #13041 (#13062)

* Increase the number of iterations in CSS safe ID generator (#13035)

* Add dropdowns to contributor docs troubleshooting (#13009)

* Simpler WebGL line shaders (#13039)

* Simplify webgl line shaders

* Update baseline images

* Add new image tests

* Add Path.is_relative_to() polyfill for Python 3.8

* [BUG] Fix broken link to tools guide (#13109)

* [BUG] Fix broken link to tools guide

#13108

* [BUG] Fix broken link to tools guide

#13108

---------

Co-authored-by: Ian Thomas <ianthomas23@gmail.com>
Co-authored-by: Timo Cornelius Metzger <39711796+tcmetzger@users.noreply.github.com>
Co-authored-by: Victoria Adesoba <victoria@makepath.com>
Co-authored-by: Mateusz Paprocki <mattpap@gmail.com>
Co-authored-by: Timon Jurschitsch <103483059+DerTimonius@users.noreply.github.com>
Co-authored-by: Sooter Saalu <53571625+Soot3@users.noreply.github.com>
Co-authored-by: Ben Russell <bprussell80@protonmail.com>
Co-authored-by: Azaya <99359668+Azaya89@users.noreply.github.com>
Co-authored-by: Medhavi Singh <78318301+Med16-11@users.noreply.github.com>
Co-authored-by: Chinmay <chinmay.cc.06@gmail.com>
Co-authored-by: Kshitiz Gupta <Kshitiz305@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Domain is not resolved correctly when using BOKEH_RESOURCES=server
2 participants