Skip to content

chore: merge main into develop to resolve PR #21 conflicts (merge commit)#25

Open
divyasinghds wants to merge 37 commits into
developfrom
chore/merge-main-into-develop-pr21-v2
Open

chore: merge main into develop to resolve PR #21 conflicts (merge commit)#25
divyasinghds wants to merge 37 commits into
developfrom
chore/merge-main-into-develop-pr21-v2

Conversation

@divyasinghds

@divyasinghds divyasinghds commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Second attempt to clear the conflicts blocking #21.

⚠️ #24 was squash-merged, which collapsed the merge commit and dropped main from develop's ancestry — so #21 still conflicted. This PR must be merged as a merge commit ("Create a merge commit"), NOT squashed, so main becomes a true ancestor of develop.

Conflicts (both add/add) resolved by keeping develop's versions:

Once merged (as a merge commit), #21 will be conflict-free.

🤖 Generated with Claude Code


Note

Low Risk
Branch-integration only; no application logic changes beyond preserving develop’s CI trigger and notebook clone behavior from conflict resolution.

Overview
Merges main into develop as a merge commit so main is again an ancestor of develop after #24 was squash-merged and dropped that history, unblocking #21.

Conflict resolution keeps develop’s versions of two add/add files: the WIP limit workflow still runs on reopened PRs (not only opened / ready_for_review), and the training guide notebook keeps the model-zoo clone cell that skips cloning when ../model-zoo already exists.

Merge with “Create a merge commit” — do not squash — or the ancestry fix will not hold.

Reviewed by Cursor Bugbot for commit 85d806c. Bugbot is set up for automated code reviews on this repo. Configure here.

divyasinghds and others added 30 commits September 16, 2025 11:09
* added files

* improvements

* improvements

* license updated

* license updated

* Update LICENSE
The GitHub notebook was outdated — minimal instructions, links to
GitLab (should be GitHub), no prerequisites, no troubleshooting,
no model zoo table, no expected outputs.

Updated to mirror the Colab notebook with:
- Prerequisites checklist with signup/join links
- Model zoo task table with all 9 task types and frameworks
- Option A (model zoo) / Option B (own model) structure
- Dataset ID instructions (where to find it)
- Available training commands table
- Expected outputs and troubleshooting for each step
- "What happens next" section (monitoring, leaderboard, compare)
- Links to docs, support, Discord

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Update training notebook to match Colab quickstart
Aligns with the optional-dependency-groups change shipping in
tracebloc-py-package 0.6.33. Default install no longer bundles every
ML framework — users pick the extra that matches their setup.

- README.md: 3-line extras table in the local-setup section.
- notebooks/traceblocTrainingGuide.ipynb cell 3: switch install cmd to
  [pytorch] as the most common setup; comment points at [tensorflow]
  and [all].

DO NOT MERGE until tracebloc_package 0.6.33 is live on real PyPI.
Currently 0.6.33 is only on TestPyPI.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Builds on top of the install-extras change (eeae340) and broadens scope
for the upcoming tracebloc_package 0.7.0 release.

Notebook changes (notebooks/traceblocTrainingGuide.ipynb):
- Cell 3 install pin: >=0.6.33 -> >=0.7.0
- Cell 11: user.uploadModel(MODEL_PATH) -> user.upload_model(MODEL_PATH)
- Cell 12 (markdown docs example): same uploadModel rename
- Cell 14: user.linkModelDataset(DATASET_ID) -> user.link_model_dataset(DATASET_ID)
- Cell 16 (reference table): experimentName, learningRate, getTrainingPlan,
  resetTrainingPlan -> experiment_name, learning_rate, get_training_plan,
  reset_training_plan
- Cell 17: experimentName + getTrainingPlan call sites updated

README.md: pip install lines bumped from >=0.6.33 to >=0.7.0 across all
three extras (pytorch, tensorflow, all).

Static rewrite only; the notebook was not executed (requires real
workspace credentials). All deprecated symbols touched here have
deprecation aliases on the Python side, so callers using the old names
would still work but emit DeprecationWarning.

Supersedes #4 (which was scoped only to the 0.6.33 install-extras
migration). The 0.6.33 release path is being collapsed into 0.7.0 now
that SDK.2/3 work has landed on develop, so this PR ships both changes
together.

Cannot merge until tracebloc_package 0.7.0 is published to real PyPI —
same merge-coordination block as #4.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
aptracebloc and others added 7 commits May 11, 2026 17:05
notebook API renames + install pin bump for tracebloc_package 0.7.0
The SDK was renamed in tracebloc/tracebloc-py-package#135. `tracebloc==0.8.1`
is live on PyPI. Notebooks and docs here still pointed at the old
`tracebloc_package` name.

- Install cells / commands: `tracebloc_package[X]>=0.7.0` -> `tracebloc[X]>=0.8.0`.
- Import cells: `from tracebloc_package import ...` -> `from tracebloc import ...`.
- README links the new PyPI page (`tracebloc`, not `tracebloc-package`).
- CLAUDE.md notes the historical name and the metadata-only redirect that
  keeps `pip install tracebloc_package` working for old notebooks.

Old name keeps working in 0.8.x via the compat shim (with
DeprecationWarning) and the redirect distribution on PyPI; this PR
moves the canonical examples to the new name.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* docs: migrate notebooks to tracebloc 0.8.x (closes #11)

The SDK was renamed in tracebloc/tracebloc-py-package#135. `tracebloc==0.8.1`
is live on PyPI. Notebooks and docs here still pointed at the old
`tracebloc_package` name.

- Install cells / commands: `tracebloc_package[X]>=0.7.0` -> `tracebloc[X]>=0.8.0`.
- Import cells: `from tracebloc_package import ...` -> `from tracebloc import ...`.
- README links the new PyPI page (`tracebloc`, not `tracebloc-package`).
- CLAUDE.md notes the historical name and the metadata-only redirect that
  keeps `pip install tracebloc_package` working for old notebooks.

Old name keeps working in 0.8.x via the compat shim (with
DeprecationWarning) and the redirect distribution on PyPI; this PR
moves the canonical examples to the new name.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* docs: bump install pin to 0.8.1 (latest)

---------

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
…link (#18)

Splits the docs portion out of #15. The fix/pr-15-conflicts branch had
correctly resolved these against main; this is the clean cut against
main without the CI workflows or stale merge history.

- notebooks/GenerateCheckWeights.ipynb: rewrite for 0.8.x SDK. The
  previous version imported `from tracebloc import ModelWeights`,
  which no longer exists in 0.8.x — running it on main currently
  raises ImportError. New version uses importlib + torch.save/pickle
  directly, matching the file layout the SDK expects (.pth for
  PyTorch, .pkl for TensorFlow).
- README.md + notebooks/traceblocTrainingGuide.ipynb: repoint the
  Colab badge from the Drive-hosted copy
  (drive/1N00idtpoaq1lk9OJE6g4bMqd8o-Qex2C) to the GitHub-backed URL
  (colab.research.google.com/github/tracebloc/start-training/...).
  The Drive copy required manual sync on every notebook update and
  drifted; the GitHub form loads the canonical notebook from main
  directly.
- notebooks/traceblocTrainingGuide.ipynb: minor UX — training_object
  → training, "Dataset" wording aligned with the use-case panel
  label, Drive-save reminder inlined in Prerequisites, .pth/.pkl
  extension fix flagged by Cursor Bugbot on #14.

Closes #13.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Splits the CI portion out of #15. These caller workflows live on
develop (added in #5, #6, #9, #10) but never reached main.

- pull_request_template.md
- workflows/add-to-kanban.yml — auto-add new issues/PRs to project 2
- workflows/customer-priority-bump.yml — bump priority on customer
  label
- workflows/kanban-closure-routing.yml — route closed work to the
  correct column
- workflows/set-pr-status.yml — set PR status on the board
- workflows/stale-backlog.yml — auto-close stale backlog issues
- workflows/wip-limit-check.yml — enforce per-column WIP limits

All delegate to the org-wide reusable workflows. No new logic in this
repo.

Closes #17.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Kept develop's wip-limit-check.yml (reopened trigger) and
model-zoo clone cell (surfaces failures), #22.

Must be merged as a MERGE COMMIT, not squashed, so main becomes
an ancestor of develop (squashing #24 dropped the merge parent).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants