G4: a page that makes 3D models, and ctl 3d
/3d beside /images, while some model makes meshes: a picture chosen, the
job asked for through the same path an API client's takes, its progress
shown (waiting for the card, n ahead; making it, the node and percent),
and the mesh in a viewer — model-viewer 4.4.0 (Apache 2.0, with three.js
and lit), served from the gateway since the page's policy loads scripts
from nowhere else — with a download and the model's licence. The mesh is
served to its owner from /3d/jobs/{id}/file; another project's person is
told there is no such job.
A job made from the portal acted for a key that does not exist: the
worker now rebuilds a session's principal from the account that made it,
while it is active and still in the project the job is charged to.
ctl 3d list|get|cancel, over /api/v1/client-jobs (/api/v1/jobs is the
control plane's own work, which ctl jobs shows).
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
dfc2f0bf15
commit
2f54780802
30 files changed
+2323
-15
No files matched your search
@@ -96,6 +96,7 @@ type AccountPages struct {
|
||||
// images says whether some model makes pictures; nil when the
|
||||
// pictures page is not mounted.
|
||||
images func() bool
|
||||
meshes func() bool
|
||||
guardLibrary func() guard.Config
|
||||
// guardFor names the guardrail policies in force for someone, and
|
||||
// whether they keep nothing; nil when there are none.
|
||||
|
||||
+3
-1
@@ -40,7 +40,9 @@ func contentSecurityPolicy(page []byte) string {
|
||||
"script-src 'self'" + prefixSpace(strings.Join(hashes, " ")) + "; " +
|
||||
"style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; " +
|
||||
"font-src 'self' https://fonts.gstatic.com; " +
|
||||
"img-src 'self' data: https:; " + // model cards show their images
|
||||
// Model cards show their images; a mesh's viewer hands its textures
|
||||
// to the browser as blob: URLs.
|
||||
"img-src 'self' data: blob: https:; " +
|
||||
"connect-src 'self'; " +
|
||||
"object-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'"
|
||||
}
|
||||
|
||||
@@ -35,3 +35,19 @@ func Images(user store.User, models []ChatModel, contexts []ChatContext, current
|
||||
// SetImages has the menu offer the pictures page while some model makes
|
||||
// them. Asked on every page, so it must be cheap: the catalog, not a request.
|
||||
func (p *AccountPages) SetImages(available func() bool) { p.images = available }
|
||||
|
||||
// Meshes renders the page that makes 3D models from a picture.
|
||||
func Meshes(user store.User, models []ChatModel, contexts []ChatContext, current, version string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
noStore(w)
|
||||
render(w, r, "meshes", imagesData{
|
||||
Nav: navFrom(r, "meshes"),
|
||||
Contexts: contexts, Context: current,
|
||||
User: user, Models: models, CSRF: csrfFor(r),
|
||||
Version: version, Now: time.Now().UTC().Format(time.RFC3339),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// SetMeshes has the menu offer the 3D page while some model makes meshes.
|
||||
func (p *AccountPages) SetMeshes(available func() bool) { p.meshes = available }
|
||||
@@ -34,3 +34,28 @@ func TestThePicturesPageDrawsInEveryLanguage(t *testing.T) {
|
||||
t.Error("no models, and the page does not say so")
|
||||
}
|
||||
}
|
||||
|
||||
func TestThe3DPageDrawsInEveryLanguageWithItsViewer(t *testing.T) {
|
||||
for _, lang := range []string{"en", "tr"} {
|
||||
req := httptest.NewRequest("GET", "/3d", nil)
|
||||
req.Header.Set("Accept-Language", lang)
|
||||
rec := httptest.NewRecorder()
|
||||
Meshes(store.User{Email: "a@b.c"}, []ChatModel{{Name: "triposr"}},
|
||||
[]ChatContext{{Value: "personal", Label: "Personal"}}, "personal", "v0")(rec, req)
|
||||
page := rec.Body.String()
|
||||
if rec.Code != 200 {
|
||||
t.Fatalf("%s: %d %s", lang, rec.Code, page)
|
||||
}
|
||||
for _, want := range []string{`<option value="triposr">`, `id="picture"`, `/3d/generate`, `model-viewer.min.js?v=`} {
|
||||
if !strings.Contains(page, want) {
|
||||
t.Errorf("%s: %s missing", lang, want)
|
||||
}
|
||||
}
|
||||
if strings.Contains(page, "meshes.") {
|
||||
t.Errorf("%s: an untranslated key is on the page", lang)
|
||||
}
|
||||
if csp := rec.Header().Get("Content-Security-Policy"); !strings.Contains(csp, "script-src 'self'") || !strings.Contains(csp, "blob:") {
|
||||
t.Errorf("policy %q", csp)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"meshes.title": "3D models",
|
||||
"meshes.picture": "Picture",
|
||||
"meshes.picture_hint": "one object, on a plain background; a PNG with a transparent background is best",
|
||||
"meshes.resolution": "Detail",
|
||||
"meshes.resolution_hint": "the model's grid: higher is finer and slower",
|
||||
"meshes.seed": "Seed",
|
||||
"meshes.make": "Make",
|
||||
"meshes.kept": "A 3D model is made as a job: it waits for the card, then takes a minute or more. It is kept for the files' retention, and you can leave this page and come back to the job by its id through the API.",
|
||||
"meshes.empty": "No model you may use makes 3D models right now.",
|
||||
"meshes.empty_why": "A model that makes them is a ComfyUI model in the catalog with <code>output: meshes</code>.",
|
||||
"meshes.js.queued": "Waiting for the card… {ahead} ahead",
|
||||
"meshes.js.queued_none": "Waiting for the card…",
|
||||
"meshes.js.running": "Making it… {node} {percent}%",
|
||||
"meshes.js.done": "Made in {s} s.",
|
||||
"meshes.js.failed": "Not made: {why}",
|
||||
"meshes.js.download": "download the .glb",
|
||||
"meshes.js.license": "Licence",
|
||||
"meshes.js.no_picture": "Choose a picture first."
|
||||
}
|
||||
@@ -12,5 +12,6 @@
|
||||
"nav.sign_out": "Sign out",
|
||||
"nav.docs": "Docs",
|
||||
"nav.settings": "Settings",
|
||||
"nav.images": "Pictures"
|
||||
"nav.images": "Pictures",
|
||||
"nav.meshes": "3D"
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"meshes.title": "3D modeller",
|
||||
"meshes.picture": "Resim",
|
||||
"meshes.picture_hint": "düz bir arka plan önünde tek bir nesne; arka planı saydam bir PNG en iyisi",
|
||||
"meshes.resolution": "Ayrıntı",
|
||||
"meshes.resolution_hint": "modelin ızgarası: yüksek değer daha ince ve daha yavaş",
|
||||
"meshes.seed": "Tohum",
|
||||
"meshes.make": "Üret",
|
||||
"meshes.kept": "3D model bir iş olarak üretilir: önce kartı bekler, sonra bir dakika ya da daha fazla sürer. Dosyaların saklama süresi boyunca tutulur; sayfadan ayrılıp işe API üzerinden kimliğiyle dönebilirsiniz.",
|
||||
"meshes.empty": "Şu anda kullanabileceğiniz, 3D model üreten bir model yok.",
|
||||
"meshes.empty_why": "3D model üreten model, katalogda <code>output: meshes</code> olan bir ComfyUI modelidir.",
|
||||
"meshes.js.queued": "Kart bekleniyor… önünde {ahead} iş var",
|
||||
"meshes.js.queued_none": "Kart bekleniyor…",
|
||||
"meshes.js.running": "Üretiliyor… {node} %{percent}",
|
||||
"meshes.js.done": "{s} sn'de üretildi.",
|
||||
"meshes.js.failed": "Üretilemedi: {why}",
|
||||
"meshes.js.download": ".glb dosyasını indir",
|
||||
"meshes.js.license": "Lisans",
|
||||
"meshes.js.no_picture": "Önce bir resim seçin."
|
||||
}
|
||||
@@ -12,5 +12,6 @@
|
||||
"nav.sign_out": "Çıkış yap",
|
||||
"nav.docs": "Belgeler",
|
||||
"nav.settings": "Ayarlar",
|
||||
"nav.images": "Görseller"
|
||||
"nav.images": "Görseller",
|
||||
"nav.meshes": "3D"
|
||||
}
|
||||
+4
-2
@@ -35,8 +35,9 @@ type Nav struct {
|
||||
// Org offers the organization page: to an administrator, and to anyone
|
||||
// who manages an organization.
|
||||
Org bool
|
||||
// Images offers the pictures page, while some model makes them.
|
||||
Images bool
|
||||
// Images offers the pictures page, while some model makes them; Meshes
|
||||
// the 3D page.
|
||||
Images, Meshes bool
|
||||
}
|
||||
|
||||
type navKey struct{}
|
||||
@@ -53,6 +54,7 @@ func (p *AccountPages) navFor(r *http.Request, user store.User, current string)
|
||||
Settings: p.hasSettings && user.IsAdmin,
|
||||
CSRF: csrfFor(r),
|
||||
Images: p.images != nil && p.images(),
|
||||
Meshes: p.meshes != nil && p.meshes(),
|
||||
}
|
||||
// Only when there is an organization to show: a link that leads to "there
|
||||
// are none" on every page is noise.
|
||||
|
||||
@@ -927,3 +927,9 @@ a.sel-link.small { font-size: .78rem; color: var(--muted); margin-left: .4rem; }
|
||||
.images-gallery img { display: block; width: 100%; height: auto; }
|
||||
.images-gallery figcaption { font-size: .8rem; color: var(--muted); padding: .45rem .6rem 0; }
|
||||
.images-prompt { font-size: .82rem; margin: .25rem .6rem .55rem; overflow-wrap: anywhere; }
|
||||
|
||||
/* The 3D page: the picture asked about, and each mesh in a viewer. */
|
||||
.meshes-picture { display: block; margin: .6rem 0; font-size: .85rem; font-weight: 600; }
|
||||
.meshes-picture input { display: block; margin-top: .3rem; font-weight: 400; }
|
||||
.meshes-preview { max-width: min(100%, 16rem); max-height: 16rem; border: 1px solid var(--line); border-radius: 6px; }
|
||||
.meshes-viewer { display: block; width: 100%; height: 22rem; background: var(--card); }
|
||||
@@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
+1118
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,178 @@
|
||||
{{define "meshes"}}<!doctype html>
|
||||
<html lang="{{lang}}"><head>
|
||||
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>{{t "meshes.title"}} · llmgw</title><link rel="stylesheet" href="{{stylesheet}}">
|
||||
<script defer src="{{asset "pages.js"}}"></script>
|
||||
<script type="module" src="{{asset "model-viewer.min.js"}}"></script>
|
||||
<meta name="csrf" content="{{.CSRF}}">
|
||||
</head><body><div class="wrap">
|
||||
<header>
|
||||
<h1>{{t "meshes.title"}}</h1>
|
||||
<p class="sub">{{.User.Email}}</p>
|
||||
{{template "nav" .Nav}}
|
||||
</header>
|
||||
|
||||
{{if gt (len .Contexts) 1}}
|
||||
<form method="get" action="/3d" class="chat-context">
|
||||
<label class="inline-label">{{t "chat.context.using"}}
|
||||
<select id="context" name="context" data-autosubmit>
|
||||
{{range .Contexts}}<option value="{{.Value}}"{{if eq .Value $.Context}} selected{{end}}>{{.Label}}</option>{{end}}
|
||||
</select></label>
|
||||
<noscript translate="no"><button type="submit" class="link">{{t "chat.context.switch"}}</button></noscript>
|
||||
</form>
|
||||
{{else if .Contexts}}{{with index .Contexts 0}}<input type="hidden" id="context" value="{{.Value}}">{{end}}{{end}}
|
||||
|
||||
{{if .Models}}
|
||||
<form id="make" class="images-form">
|
||||
<div class="chat-bar">
|
||||
<label class="inline-label">{{t "chat.model"}}
|
||||
<select id="model">{{range .Models}}<option value="{{.Name}}">{{.Name}}{{with .Runs}} · {{.}}{{end}}</option>{{end}}</select>
|
||||
</label>
|
||||
<label class="inline-label">{{t "meshes.resolution"}}
|
||||
<select id="resolution" title="{{t "meshes.resolution_hint"}}">
|
||||
<option value="">—</option><option>192</option><option>256</option><option>384</option><option>512</option>
|
||||
</select></label>
|
||||
<label class="inline-label">{{t "meshes.seed"}}
|
||||
<input type="number" id="seed" min="0" step="1" class="images-num"></label>
|
||||
</div>
|
||||
<label class="meshes-picture">{{t "meshes.picture"}} <span class="opt">{{t "meshes.picture_hint"}}</span>
|
||||
<input type="file" id="picture" accept="image/png,image/jpeg,image/webp"></label>
|
||||
<img id="preview" class="meshes-preview" alt="" hidden>
|
||||
<div class="chat-composer"><button type="submit" id="go">{{t "meshes.make"}}</button></div>
|
||||
</form>
|
||||
<p id="status" class="note" aria-live="polite"></p>
|
||||
<div id="gallery" class="images-gallery"></div>
|
||||
<p class="note">{{t "meshes.kept"}}</p>
|
||||
{{else}}
|
||||
<p class="empty">{{t "meshes.empty"}}</p>
|
||||
<p class="note">{{th "meshes.empty_why"}}</p>
|
||||
{{end}}
|
||||
|
||||
<footer><span>llmgw {{.Version}}</span><span>{{.Now}}</span>{{template "langs"}}</footer>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const say = {
|
||||
queued: {{t "meshes.js.queued"}},
|
||||
queuedNone: {{t "meshes.js.queued_none"}},
|
||||
running: {{t "meshes.js.running"}},
|
||||
done: {{t "meshes.js.done"}},
|
||||
failed: {{t "meshes.js.failed"}},
|
||||
download: {{t "meshes.js.download"}},
|
||||
license: {{t "meshes.js.license"}},
|
||||
noPicture: {{t "meshes.js.no_picture"}},
|
||||
decimal: {{t "_meta.decimal"}},
|
||||
};
|
||||
function fill(s, vals) { return s.replace(/\{(\w+)\}/g, (m, k) => (k in vals ? String(vals[k]) : m)); }
|
||||
function fixed(n, places) { return n.toFixed(places).replace(".", say.decimal); }
|
||||
// A 3D model is a job: asked for, then asked after until it is made. The
|
||||
// mesh is shown from the gateway itself, which the page's policy allows.
|
||||
(function () {
|
||||
const form = document.getElementById("make");
|
||||
if (!form) return;
|
||||
const csrf = document.querySelector('meta[name="csrf"]').content;
|
||||
const $ = (id) => document.getElementById(id);
|
||||
const status = $("status"), gallery = $("gallery"), go = $("go"), preview = $("preview");
|
||||
let picture = "";
|
||||
const ctx = () => ($("context") ? $("context").value : "");
|
||||
|
||||
$("picture").addEventListener("change", () => {
|
||||
const f = $("picture").files[0];
|
||||
if (!f) return;
|
||||
const rd = new FileReader();
|
||||
rd.addEventListener("load", () => {
|
||||
picture = rd.result;
|
||||
preview.src = picture;
|
||||
preview.hidden = false;
|
||||
});
|
||||
rd.readAsDataURL(f);
|
||||
});
|
||||
|
||||
function describe(j) {
|
||||
const p = j.progress || {};
|
||||
if (j.status === "queued" || p.state === "queued" || !p.state) {
|
||||
return p.ahead ? fill(say.queued, { ahead: p.ahead }) : say.queuedNone;
|
||||
}
|
||||
return fill(say.running, { node: p.node_class || "", percent: p.percent || 0 });
|
||||
}
|
||||
|
||||
async function follow(id, started) {
|
||||
const q = ctx() ? "?context=" + encodeURIComponent(ctx()) : "";
|
||||
for (;;) {
|
||||
const resp = await fetch("/3d/jobs/" + encodeURIComponent(id) + q);
|
||||
const j = await resp.json().catch(() => ({}));
|
||||
if (!resp.ok) throw new Error((j.error && j.error.message) || String(resp.status));
|
||||
if (j.status === "completed") return j;
|
||||
if (["failed", "cancelled", "expired"].includes(j.status)) {
|
||||
throw new Error((j.error && j.error.message) || j.status);
|
||||
}
|
||||
status.textContent = describe(j);
|
||||
await new Promise((r) => setTimeout(r, 2000));
|
||||
}
|
||||
}
|
||||
|
||||
function show(j, took) {
|
||||
const q = ctx() ? "?context=" + encodeURIComponent(ctx()) : "";
|
||||
const src = "/3d/jobs/" + encodeURIComponent(j.id) + "/file" + q;
|
||||
const fig = document.createElement("figure");
|
||||
const mv = document.createElement("model-viewer");
|
||||
mv.setAttribute("src", src);
|
||||
mv.setAttribute("camera-controls", "");
|
||||
mv.setAttribute("auto-rotate", "");
|
||||
mv.setAttribute("shadow-intensity", "0.6");
|
||||
mv.className = "meshes-viewer";
|
||||
const cap = document.createElement("figcaption");
|
||||
const line = document.createElement("span");
|
||||
line.textContent = j.model + " · " + j.id + " · " + fill(say.done, { s: fixed(took, 0) });
|
||||
const dl = document.createElement("a");
|
||||
dl.href = src;
|
||||
dl.download = j.id + ".glb";
|
||||
dl.className = "link";
|
||||
dl.textContent = say.download;
|
||||
cap.append(line, " ", dl);
|
||||
fig.append(mv, cap);
|
||||
if (j.license) {
|
||||
const lic = document.createElement("p");
|
||||
lic.className = "images-prompt";
|
||||
lic.textContent = say.license + ": " + j.license.name + (j.license.notice ? " — " + j.license.notice : "");
|
||||
fig.append(lic);
|
||||
}
|
||||
gallery.prepend(fig);
|
||||
}
|
||||
|
||||
form.addEventListener("submit", async (e) => {
|
||||
e.preventDefault();
|
||||
if (go.disabled) return;
|
||||
if (!picture) { status.textContent = say.noPicture; return; }
|
||||
const body = { model: $("model").value, image: picture, context: ctx() };
|
||||
if ($("seed").value !== "") body.seed = Number($("seed").value);
|
||||
if ($("resolution").value !== "") body.resolution = Number($("resolution").value);
|
||||
go.disabled = true;
|
||||
status.classList.remove("error");
|
||||
status.textContent = say.queuedNone;
|
||||
const start = performance.now();
|
||||
try {
|
||||
const resp = await fetch("/3d/generate", {
|
||||
method: "POST", headers: { "Content-Type": "application/json", "X-CSRF-Token": csrf },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
const text = await resp.text();
|
||||
let j = null;
|
||||
try { j = JSON.parse(text); } catch (_) {}
|
||||
if (!resp.ok || !j || !j.id) {
|
||||
throw new Error(String((j && j.error && j.error.message) || text.trim() || resp.status));
|
||||
}
|
||||
const done = await follow(j.id, start);
|
||||
const took = (performance.now() - start) / 1000;
|
||||
status.textContent = fill(say.done, { s: fixed(took, 0) });
|
||||
show(done, took);
|
||||
} catch (err) {
|
||||
status.textContent = fill(say.failed, { why: err.message });
|
||||
status.classList.add("error");
|
||||
} finally {
|
||||
go.disabled = false;
|
||||
}
|
||||
});
|
||||
})();
|
||||
</script>
|
||||
</body></html>{{end}}
|
||||
@@ -31,6 +31,9 @@
|
||||
{{- if .Images}}
|
||||
<a href="/images"{{if eq .Current "images"}} aria-current="page"{{end}}>{{t "nav.images"}}</a>
|
||||
{{- end}}
|
||||
{{- if .Meshes}}
|
||||
<a href="/3d"{{if eq .Current "meshes"}} aria-current="page"{{end}}>{{t "nav.meshes"}}</a>
|
||||
{{- end}}
|
||||
<a href="/profile"{{if eq .Current "keys"}} aria-current="page"{{end}}>{{t "nav.account"}}</a>
|
||||
<a href="/docs"{{if eq .Current "docs"}} aria-current="page"{{end}}>{{t "nav.docs"}}</a>
|
||||
<form method="post" action="/logout" class="inline">
|
||||
|
||||
Reference in new issue
Block a user