Merge branch 'dev' into json3

Author: waralex

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
 
   test:
-    working_directory: ~/dashjl 
+    working_directory: ~/dashjl
     docker:
       - image: plotly/julia:ci
         auth:
@@ -30,15 +30,15 @@ jobs:
       - run:
           name: 🔎 Unit tests
           command: |
-            julia test/ci_prepare.jl 
+            julia test/ci_prepare.jl
 
       - run:
           name: ⚙️  Integration tests
           command: |
             python -m venv venv
             . venv/bin/activate
             git clone --depth 1 https://github.com/plotly/dash.git -b dev dash-main
-            cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ~/dashjl 
+            cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ~/dashjl
             export PATH=$PATH:/home/circleci/.local/bin/
             pytest --headless --nopercyfinalize --junitxml=test-reports/dashjl.xml --percy-assets=test/assets/ test/integration/
       - store_artifacts:
@@ -51,7 +51,6 @@ jobs:
       - run:
           name: 🦔 percy finalize
           command: npx percy finalize --all
-          when: on_fail
 
 workflows:
   version: 2

src/app/callbacks.jl

@@ -165,21 +165,11 @@ function check_callback(func, app::DashApp, deps::CallbackDeps)
     isempty(deps.output) && error("The callback method requires that one or more properly formatted outputs are passed.")
     isempty(deps.input) && error("The callback method requires that one or more properly formatted inputs are passed.")
 
-    !check_unique(deps.output) && error("One or more callback outputs have been duplicated; please confirm that all outputs are unique.")
-
-    for out in deps.output
-        if any(x->out in x.dependencies.output, values(app.callbacks))
-            error("output \"$(out)\" already registered")
-        end
-    end
 
     args_count = length(deps.state) + length(deps.input)
 
     check_callback_func(func, args_count)
 
-    for id_prop in deps.input
-        id_prop in deps.output && error("Circular input and output arguments were found. Please verify that callback outputs are not also input arguments.")
-    end
 end
 
 function check_callback_func(func::Function, args_count)

src/favicon.ico

@@ -1,6 +1,8 @@
 using .Contexts
 const CallbackContextItems = Union{Nothing, Vector{NamedTuple}}
 const TriggeredParam = NamedTuple{(:prop_id, :value)}
+
+
 mutable struct CallbackContext
     response::HTTP.Response
     inputs::Dict{String, Any}

src/handler/callback_context.jl

@@ -99,15 +99,30 @@ end
 
 renderer_html() = """<script id="_dash-renderer" type="application/javascript">var renderer = new DashRenderer();</script>"""
 
-favicon_html(app::DashApp) = ""
+function favicon_html(app::DashApp, resources::ApplicationResources)
+    favicon_url = if !isnothing(resources.favicon)
+        asset_path(app, resources.favicon.path)
+    else
+        "$(get_setting(app, :requests_pathname_prefix))_favicon.ico?v=$(build_info().dash_version)"
+    end
+    return format_tag(
+        "link",
+        Dict(
+            "rel" => "icon",
+            "type" => "image/x-icon",
+            "href" => favicon_url
+        ),
+        opened = true
+        )
+end
 
 
 function index_page(app::DashApp, resources::ApplicationResources)
 
     result = interpolate_string(app.index_string,
         metas = metas_html(app),
         title = app.title,
-        favicon = favicon_html(app),
+        favicon = favicon_html(app, resources),
         css = css_html(app, resources),
         app_entry = app_entry_html(),
         config = config_html(app),

src/handler/index_page.jl

@@ -5,6 +5,7 @@ include("processors/index.jl")
 include("processors/layout.jl")
 include("processors/reload_hash.jl")
 include("processors/resource.jl")
+include("processors/default_favicon.jl")
 
 function start_reload_poll(state::HandlerState)
     folders = Set{String}()
@@ -124,6 +125,7 @@ function make_handler(app::DashApp, registry::ResourcesRegistry; check_layout =
     add_route!(process_layout, router, "$(prefix)_dash-layout")
     add_route!(process_dependencies, router, "$(prefix)_dash-dependencies")
     add_route!(process_reload_hash, router, "$(prefix)_reload-hash")
+    add_route!(process_default_favicon, router, "$(prefix)_favicon.ico")
     add_route!(process_resource, router, "$(prefix)_dash-component-suites/<namespace>/<path>")
     add_route!(process_assets, router, "$(prefix)$(assets_url_path)/<file_path>")
     add_route!(process_callback, router, "POST", "$(prefix)_dash-update-component")

src/handler/make_handler.jl

@@ -1,11 +1,14 @@
+function split_single_callback_id(callback_id::AbstractString)
+    parts = rsplit(callback_id, ".")
+    return (id = parts[1], property = parts[2])
+end
 function split_callback_id(callback_id::AbstractString)
     if startswith(callback_id, "..")
         result = []
-        append!.(Ref(result), split_callback_id.(split(callback_id[3:end-2], "...", keepempty = false)))
+        push!.(Ref(result), split_single_callback_id.(split(callback_id[3:end-2], "...", keepempty = false)))
         return result
     end
-    parts = rsplit(callback_id, ".")
-    return [(id = parts[1], property = parts[2])]
+    return split_single_callback_id(callback_id)
 end
 
 input_to_arg(input) = get(input, :value, nothing)
@@ -51,8 +54,7 @@ function process_callback_call(app, callback_id, outputs, inputs, state)
     return Dict(:response=>response, :multi=>true)
 end
 
-outputs_to_vector(out::AbstractVector) = out
-outputs_to_vector(out) = [out]
+outputs_to_vector(out, is_multi) = is_multi ? out : [out]
 
 function process_callback(request::HTTP.Request, state::HandlerState)
     app = state.app
@@ -62,11 +64,14 @@ function process_callback(request::HTTP.Request, state::HandlerState)
     inputs = get(params, :inputs, [])
     state = get(params, :state, [])
     output = Symbol(params[:output])
-    outputs_list = outputs_to_vector(get(params, :outputs, split_callback_id(params[:output])))
-    changedProps = get(params, :changedPropIds, [])
-    context = CallbackContext(response, outputs_list, inputs, state, changedProps)
 
     try
+        is_multi = is_multi_out(app.callbacks[output])
+        outputs_list = outputs_to_vector(
+                get(params, :outputs, split_callback_id(params[:output])),
+                is_multi)
+        changedProps = get(params, :changedPropIds, [])
+        context = CallbackContext(response, outputs_list, inputs, state, changedProps)
         cb_result = with_callback_context(context) do
             process_callback_call(app, output, outputs_list, inputs, state)
         end

src/handler/processors/callback.jl

@@ -0,0 +1,10 @@
+function process_default_favicon(request::HTTP.Request, state::HandlerState)
+    ico_contents = read(
+        joinpath(ROOT_PATH, "src", "favicon.ico")
+    )
+    return HTTP.Response(
+        200,
+        ["Content-Type" => "image/x-icon"],
+        body = ico_contents
+        )
+end

src/handler/processors/default_favicon.jl

@@ -27,22 +27,22 @@ struct ApplicationResources
     files ::Dict{String, NamespaceFiles}
     css ::Vector{AppResource}
     js ::Vector{AppResource}
-    favicon ::Union{Nothing, String}
+    favicon ::Union{Nothing, AppAssetResource}
     ApplicationResources(files, css, js, favicon) = new(files, css, js, favicon)
 end
 
 
 function ApplicationResources(app::DashApp, registry::ResourcesRegistry)
     css = AppResource[]
     js = AppResource[]
-    favicon::Union{Nothing, String} = nothing
+    favicon::Union{Nothing, AppResource} = nothing
     files = Dict{String, NamespaceFiles}()
-    
+
     serve_locally = get_setting(app, :serve_locally)
     assets_external_path = get_setting(app, :assets_external_path)
     dev = get_devsetting(app, :serve_dev_bundles)
     eager_loading = get_setting(app, :eager_loading)
-    
+
     append_pkg = function(pkg)
         append!(css,
             _convert_resource_pkg(pkg, :css, dev = dev, serve_locally = serve_locally, eager_loading = eager_loading)
@@ -58,10 +58,10 @@ function ApplicationResources(app::DashApp, registry::ResourcesRegistry)
 
     append_pkg(get_dash_dependencies(registry, get_devsetting(app, :props_check)))
 
-    append!(css, 
+    append!(css,
         _convert_external.(get_setting(app, :external_stylesheets))
     )
-    append!(js, 
+    append!(js,
         _convert_external.(get_setting(app, :external_scripts))
     )
 
@@ -72,7 +72,7 @@ function ApplicationResources(app::DashApp, registry::ResourcesRegistry)
             elseif type == :css
                 push!(css, asset_resource(url, modified))
             elseif type == :favicon
-                favicon = url
+                favicon = AppAssetResource(url, modified)
             end
         end
     end
@@ -113,7 +113,7 @@ function walk_assets(callback, app::DashApp)
     assets_filter = isempty(assets_ignore) ?
         (f) -> true :
         (f) -> !occursin(assets_regex, f)
-        
+
     assets_path = get_assets_path(app)
     if get_setting(app, :include_assets_files) && isdir(assets_path)
         for (base, dirs, files) in walkdir(assets_path)
@@ -181,9 +181,9 @@ function _convert_resource_pkg(pkg::ResourcePkg, type::Symbol; dev, serve_locall
     ts = ispath(pkg.path) ? trunc(Int64, stat(pkg.path).mtime) : 0
     for resource in iterator
         append!(
-            result, 
+            result,
             _convert_resource(
-                    resource, 
+                    resource,
                     namespace = pkg.namespace,
                     version = pkg.version,
                     ts = ts,