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

Interface mount #562

Closed

meztez wants to merge 65 commits into rstudio:master from meztez:interface_mount

Collaborator

meztez commented Jun 23, 2020

Decouple ui mounting from the run method and generalize interface

PR task list:

Update NEWS
Add tests
Update documentation with devtools::document()

Bruno Tremblay added 3 commits

June 23, 2020 09:20


          ui mounting and generalize interface

cd52da2


          merge master

Merge remote-tracking branch 'upstream/master' into interface_mount

# Conflicts:
#	R/plumber.R
#	man/plumber.Rd


          update news and description

d891473

meztez mentioned this pull request

Work in progress, combined PR #536

Closed

30 tasks

Bruno Tremblay added 2 commits

June 23, 2020 09:40


          typo

40aa40c


          comment out redoc

6ae7cef

meztez commented

View reviewed changes

R/ui.R Show resolved Hide resolved

meztez commented

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

meztez commented

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

NEWS.md Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

NEWS.md Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

scripts/manual_testing.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

schloerke reviewed

View reviewed changes

R/ui.R Outdated Show resolved Hide resolved

Collaborator

schloerke commented Jun 23, 2020 •

edited

Loading

Lots of small changes. Trying to future-safeguard external "contracts" with other packages as we won't be able to update them when we want.

meztez and others added 8 commits

June 23, 2020 14:42


          Update NEWS.md

a1890c0

Co-authored-by: Barret Schloerke <barret@rstudio.com>


          Update NEWS.md

a5236b8

Co-authored-by: Barret Schloerke <barret@rstudio.com>


          mid PR review

2f0cb37


          merge master

b0858b8

Merge remote-tracking branch 'upstream/master' into interface_mount

# Conflicts:
#	DESCRIPTION
#	R/plumber.R
#	man/plumber.Rd


          remove UI mounts on.exit, PR review.

17143be


          Merge branch 'interface_mount' of github.com:meztez/plumber into inte…

b38a559

…rface_mount


          comment out redoc

b15a514


          vector allocation, named arg

c9406a2

meztez requested a review from cpsievert

July 3, 2020 15:39

Bruno Tremblay added 2 commits

July 4, 2020 08:44


          inverse mount$ui_name to ui_name$mount, remove branch polution from o…

…penapi


          merge master

a2434b0

Merge remote-tracking branch 'upstream/master' into interface_mount

# Conflicts:
#	R/plumber.R

meztez mentioned this pull request

$handle method doesn't handle parameters as expected #591

Closed


          Remove Redoc and RapiDoc reference, wait after they hit CRAN.

cpsievert reviewed

View reviewed changes

R/plumber.R Outdated Show resolved Hide resolved

cpsievert reviewed

View reviewed changes

R/plumber.R Outdated Show resolved Hide resolved

cpsievert reviewed

View reviewed changes

R/plumber-options.R Outdated Show resolved Hide resolved

Bruno Tremblay and others added 2 commits

July 13, 2020 15:26


          Update R/plumber.R

5af07b8

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>


          Update R/plumber.R

78c5fa3

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>

cpsievert reviewed

View reviewed changes

R/plumber.R Outdated Show resolved Hide resolved


          Move up apiURL option. PR corrections

e71309b

cpsievert reviewed

View reviewed changes

inst/examples/15-openapi-spec/entrypoint.R Outdated Show resolved Hide resolved

cpsievert reviewed

View reviewed changes

R/plumber.R Outdated Show resolved Hide resolved


          rename setApiHandler to apiSpecHandler, check for null scheme

ff42f8c

cpsievert reviewed

View reviewed changes

NEWS.md Outdated Show resolved Hide resolved

cpsievert reviewed

View reviewed changes

NEWS.md Outdated Show resolved Hide resolved


          rename apiSpecHandler to apiSpecTransform

541a5e5

cpsievert reviewed

View reviewed changes

NEWS.md Outdated Show resolved Hide resolved

cpsievert self-requested a review

July 13, 2020 20:06

cpsievert approved these changes

View reviewed changes

Contributor

cpsievert left a comment

LGTM pending comments


          Update NEWS according to PR suggestion.

e26d6d5

schloerke reviewed

View reviewed changes

R/plumber.R Outdated

-                    swaggerCallback = getOption('plumber.swagger.url', NULL)
+                    swaggerCallback,
+                    ...,
+                    callback = getOption('plumber.ui.callback', getOption('plumber.swagger.url', NULL))

Collaborator

schloerke Jul 17, 2020

Received more feedback from the Connect team. I'd like to remove this argument and make it a R6 router method.

The default return value for the R6 method should still be getOption('plumber.swagger.url').

I'd also like to do this for debug. Where the default value is interactive().

This makes it so the $run() method has NOTHING in the parameters except for host and port.

Collaborator Author

meztez Jul 17, 2020 •

edited

Loading

I've done as you suggested.
Also added a callback argument to setUI and added a setDebug method.

Note : @cpsievert previously requested to add back the arguments to the run method as they were removed originally.

Bruno Tremblay added 2 commits

July 19, 2020 17:45


          Merge remote-tracking branch 'upstream/master' into interface_mount

b90630f


          removing arguments swagger, swaggerCallback and ... from run R6 plumb…

3f6f397

…er class as requested by @schloerke

schloerke mentioned this pull request

Register UI interfaces and remove non-essential $run() arguments #598

Merged

3 tasks

schloerke added the Fixed in PR label

meztez closed this

Contributor

muschellij2 commented Aug 11, 2020

It looks like

plumber/R/plumber.R

Line 871 in dcc178e

set_ui = function(

was changed to set_ui but still uses setUI in

plumber/inst/server/plumber.service

Line 5 in 13f8134

    
           ExecStart=/usr/bin/Rscript -e "pr <- plumber::plumb('/var/plumber$PATH$/plumber.R'); pr$setUI($SWAGGER$); $PREFLIGHT$ pr$run(port=$PORT$)"

Collaborator

schloerke commented Aug 12, 2020

@muschellij2 Fixed in 69e5011. 🙌

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