#0.17.0-llm.4
nocturne skiff
Sorry @unreal sluice I'm getting merge conflicts on main, worried I'll mess it up
@silent Ah, it's from dagop @olive sage (sorry wrong ping)
olive sage
@silent Ah, it's from dagop <@488718750690967563> (sorry wrong ping)
no worries 😄
might be worth checking that things still work as expected after the merge, there might be some rough edges around some of the dagql changes i made 🤔 i think they're all good though
nocturne skiff
@olive sage this is the conflict:
diff --cc dagql/server.go
index 215fde081,fd7df45f1..000000000
--- a/dagql/server.go
+++ b/dagql/server.go
@@@ -600,31 -606,11 +613,39 @@@ func (s *Server) Select(ctx context.Con
return assign(reflect.ValueOf(dest).Elem(), res)
}
++<<<<<<< HEAD
+func (s *Server) SelectID(ctx context.Context, self Object, sels ...Selector) (*call.ID, error) {
+ var res Typed = self
+ var id *call.ID
+ for i, sel := range sels {
+ var err error
+ res, id, err = self.ReturnType(ctx, sel)
+ if err != nil {
+ return nil, fmt.Errorf("select: %w", err)
+ }
+
+ if _, ok := s.ObjectType(res.Type().Name()); ok {
+ // if the result is an Object, set it as the next selection target, and
+ // assign res to the "hydrated" Object
+ self, err = s.toSelectable(id, res)
+ if err != nil {
+ return nil, err
+ }
+ res = self
+ } else if i+1 < len(sels) {
+ // if the result is not an object and there are further selections,
+ // that's a logic error.
+ return nil, fmt.Errorf("cannot sub-select %s", res.Type())
+ }
+ }
+ return id, nil
++=======
+ // Attach a middleware to hook into object installation
+ func (s *Server) SetMiddleware(middleware Middleware) {
+ s.installLock.Lock()
+ s.middleware = middleware
+ s.installLock.Unlock()
++>>>>>>> 3b1593482 (POC: convert any agent to a LLM-powered object)
}
func LoadIDs[T Typed](ctx context.Context, srv *Server, ids []ID[T]) ([]T, error) {
yeah i resolved + pushed
nocturne skiff
oh thanks!
olive sage
it should be on upstream/llm
nocturne skiff
fantastic thank you. I didn't want to miss out on the dagop goodness for llm.4 🙂
olive sage
😄
nocturne skiff
faster asTarball maybe translates to faster builds? 🙂
olive sage
🤞