Skip to content

Conversation

@bmerkle
Copy link
Contributor

@bmerkle bmerkle commented Dec 28, 2025

  • create src
  • move typeagent to src
  • adapt config files

#125

@bmerkle bmerkle changed the title 125 src-create: created src and move typeagent to src created src and move typeagent to src Dec 28, 2025
@gvanrossum gvanrossum self-requested a review December 29, 2025 00:55
Copy link
Collaborator

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

Just two tiny suggestions and one formatting nit. I will merge after you fix those.

@gvanrossum
Copy link
Collaborator

Oh, and you need to merge the conflict caused by me merging my unused-xxx fix first (Rob was okay reviewing it).

Copy link
Collaborator

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

You're on Windows, right? Did you look at what needs to change in Makefile? The format and check entries need to change typeagent to src, and the mcp entry needs to use src/typeagent.

Co-authored-by: Guido van Rossum <gvanrossum@gmail.com>
@gvanrossum
Copy link
Collaborator

in get_keys.py i get a make format modification which was not commited in main branch. it breaks it in several lines, not sure if CodeQL will accept that.

   self.credential = (
          DefaultAzureCredential()
      )  # CodeQL [SM05139] - This code is used as part of development setup only.

Rob is working on that in #131. For now ignore those errors.

@bmerkle
Copy link
Contributor Author

bmerkle commented Dec 29, 2025

ok I have pushed. Should be fine now.

@gvanrossum
Copy link
Collaborator

I think your tests are failing because of #133. I will retest locally (I have a workaround) and then merge.

@gvanrossum gvanrossum self-requested a review December 29, 2025 22:37
@gvanrossum gvanrossum requested a review from robgruen December 29, 2025 22:38
@gvanrossum
Copy link
Collaborator

gvanrossum commented Dec 29, 2025

Sorry, I can't merge this by myself. I need @robgruen's approval for my suggestions that were merged. (Re-approving doesn't help.)

@gvanrossum
Copy link
Collaborator

And it still won't merge. @robgruen can you merge this? Otherwise we're stuck.

@bmerkle
Copy link
Contributor Author

bmerkle commented Dec 30, 2025

when we have merged this PR into main, I would create a new PR for the remaining topics of #125

the PR is already here https://github.com/bmerkle/typeagent-py/tree/125

I hope it is ok the make the remaining steps in one PR ?

  • move test 125-tests
  • introduce samples 125-samples
  • move spec-to-docs 125-spec

after that the structure should be ok, and we can continue with functional improvements

@gvanrossum
Copy link
Collaborator

Can we just move test to tests? I'm not convinced we need a samples subdir (is that even a standard? and it feels like an odd word to me). The spec subdir probably needs to be deleted, not moved -- it was part of a failed AI experiment (the AI generated the spec but then wasn't able to implement it, and I couldn't get myself to edit it, it was way too verbose and repetitive). You can delete spec/ in a separate PR since it can be merged independent from everything else.

@gvanrossum
Copy link
Collaborator

gvanrossum commented Dec 30, 2025

I wonder if we could make progress here if you did something like this:

  • git checkout 125-src-create
  • git diff main >125.diff
  • git branch 125-redo
  • git checkout 125-redo # <----------------- IMPORTANT
  • git apply 125.diff
  • (git commit?)
  • git push
  • make a few PR from the new branch

That would have a cleaner history (a single commit, by you) and maybe if I approve it I can merge it.

@gvanrossum
Copy link
Collaborator

Note I added a step after that comment sent an email -- use the version on GitHub, not the email (if you read those).

@bmerkle
Copy link
Contributor Author

bmerkle commented Dec 30, 2025

yup, we can make

  • one PR with move of test to tests
  • a second PR with rearrangement of samples, docs, specs, examples. I described a bit in migrate to python standard project layout #125 what would make sense, but it do not know if there are any outdate files which should be deleted.
  • IIRC most github repos have an "examples" in parallel to "src" where you can look how the framework is used etc. (so not "samples" but "examples"

@gvanrossum
Copy link
Collaborator

gvanrossum commented Dec 30, 2025 via email

@bmerkle
Copy link
Contributor Author

bmerkle commented Dec 30, 2025

I wonder if we could make progress here if you did something like this:

  • git checkout 125-src-create
  • git diff main >125.diff
  • git branch 125-redo
  • git checkout 125-redo # <----------------- IMPORTANT
  • git apply 125.diff
  • (git commit?)
  • git push
  • make a few PR from the new branch

That would have a cleaner history (a single commit, by you) and maybe if I approve it I can merge it.

i could squash it if that is want you mean ?

@gvanrossum
Copy link
Collaborator

i could squash it if that is want you mean ?

I've never used squash, but it sounds like it might work. Key requirement for a clean merge is (1) one diff, (2) authored by you only, and probably (3) in a new branch and PR.

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.

3 participants