@@ -12,7 +12,7 @@ import (
1212
1313// Entity represents a wit-ai Entity.
1414//
15- // https://wit.ai/docs/http/20200513/ #post__entities_link
15+ // https://wit.ai/docs/http/#post__entities_link
1616type Entity struct {
1717 ID string `json:"id"`
1818 Name string `json:"name"`
@@ -21,17 +21,30 @@ type Entity struct {
2121 Keywords []EntityKeyword `json:"keywords,omitempty"`
2222}
2323
24+ type CreateEntityResponse struct {
25+ ID string `json:"id"`
26+ Name string `json:"name"`
27+ Lookups []string `json:"lookups,omitempty"`
28+ Roles []EntityRole `json:"roles,omitempty"`
29+ Keywords []EntityKeyword `json:"keywords,omitempty"`
30+ }
31+
32+ type EntityRole struct {
33+ ID string `json:"id"`
34+ Name string `json:"name"`
35+ }
36+
2437// EntityKeyword is a keyword lookup for an Entity.
2538//
26- // https://wit.ai/docs/http/20200513/ #post__entities__entity_keywords_link
39+ // https://wit.ai/docs/http/#post__entities__entity_keywords_link
2740type EntityKeyword struct {
2841 Keyword string `json:"keyword"`
2942 Synonyms []string `json:"synonyms"`
3043}
3144
3245// GetEntities - returns list of entities.
3346//
34- // https://wit.ai/docs/http/20200513/ #get__entities_link
47+ // https://wit.ai/docs/http/#get__entities_link
3548func (c * Client ) GetEntities () ([]Entity , error ) {
3649 resp , err := c .request (http .MethodGet , "/entities" , "application/json" , nil )
3750 if err != nil {
@@ -48,8 +61,8 @@ func (c *Client) GetEntities() ([]Entity, error) {
4861
4962// CreateEntity - Creates a new entity with the given attributes
5063//
51- // https://wit.ai/docs/http/20200513/ #post__entities_link
52- func (c * Client ) CreateEntity (entity Entity ) (* Entity , error ) {
64+ // https://wit.ai/docs/http/#post__entities_link
65+ func (c * Client ) CreateEntity (entity Entity ) (* CreateEntityResponse , error ) {
5366 entityJSON , err := json .Marshal (entity )
5467 if err != nil {
5568 return nil , err
@@ -62,54 +75,56 @@ func (c *Client) CreateEntity(entity Entity) (*Entity, error) {
6275
6376 defer resp .Close ()
6477
65- var entityResp * Entity
78+ var entityResp * CreateEntityResponse
6679 decoder := json .NewDecoder (resp )
6780 err = decoder .Decode (& entityResp )
6881 return entityResp , err
6982}
7083
7184// GetEntity - returns entity by ID or name.
7285//
73- // https://wit.ai/docs/http/20200513/ #get__entities__entity_link
74- func (c * Client ) GetEntity (entityID string ) (* Entity , error ) {
86+ // https://wit.ai/docs/http/#get__entities__entity_link
87+ func (c * Client ) GetEntity (entityID string ) (* CreateEntityResponse , error ) {
7588 resp , err := c .request (http .MethodGet , fmt .Sprintf ("/entities/%s" , url .PathEscape (entityID )), "application/json" , nil )
7689 if err != nil {
7790 return nil , err
7891 }
7992
8093 defer resp .Close ()
8194
82- var entity * Entity
95+ var entity * CreateEntityResponse
8396 decoder := json .NewDecoder (resp )
8497 err = decoder .Decode (& entity )
8598 return entity , err
8699}
87100
88- // UpdateEntity - Updates an entity by ID or name.
101+ // UpdateEntity - Updates an entity by name.
89102//
90- // https://wit.ai/docs/http/20200513/ #put__entities__entity_link
91- func (c * Client ) UpdateEntity (entityID string , entity Entity ) error {
103+ // https://wit.ai/docs/http/#put__entities__entity_link
104+ func (c * Client ) UpdateEntity (name string , entity Entity ) ( * CreateEntityResponse , error ) {
92105 entityJSON , err := json .Marshal (entity )
93106 if err != nil {
94- return err
107+ return nil , err
95108 }
96109
97- resp , err := c .request (http .MethodPut , fmt .Sprintf ("/entities/%s" , url .PathEscape (entityID )), "application/json" , bytes .NewBuffer (entityJSON ))
110+ resp , err := c .request (http .MethodPut , fmt .Sprintf ("/entities/%s" , url .PathEscape (name )), "application/json" , bytes .NewBuffer (entityJSON ))
98111 if err != nil {
99- return err
112+ return nil , err
100113 }
101114
102115 defer resp .Close ()
103116
117+ var entityResp * CreateEntityResponse
104118 decoder := json .NewDecoder (resp )
105- return decoder .Decode (& entity )
119+ err = decoder .Decode (& entityResp )
120+ return entityResp , err
106121}
107122
108- // DeleteEntity - deletes entity by ID or name.
123+ // DeleteEntity - deletes entity by name
109124//
110- // https://wit.ai/docs/http/20200513/ #delete__entities__entity_link
111- func (c * Client ) DeleteEntity (entityID string ) error {
112- resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s" , url .PathEscape (entityID )), "application/json" , nil )
125+ // https://wit.ai/docs/http/#delete__entities__entity_link
126+ func (c * Client ) DeleteEntity (name string ) error {
127+ resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s" , url .PathEscape (name )), "application/json" , nil )
113128 if err == nil {
114129 resp .Close ()
115130 }
@@ -119,9 +134,9 @@ func (c *Client) DeleteEntity(entityID string) error {
119134
120135// DeleteEntityRole - deletes entity role.
121136//
122- // https://wit.ai/docs/http/20200513/ #delete__entities__entity_role_link
123- func (c * Client ) DeleteEntityRole (entityID string , role string ) error {
124- resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s:%s" , url .PathEscape (entityID ), url .PathEscape (role )), "application/json" , nil )
137+ // https://wit.ai/docs/http/#delete__entities__entity_role_link
138+ func (c * Client ) DeleteEntityRole (name string , role string ) error {
139+ resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s:%s" , url .PathEscape (name ), url .PathEscape (role )), "application/json" , nil )
125140 if err == nil {
126141 resp .Close ()
127142 }
@@ -131,7 +146,7 @@ func (c *Client) DeleteEntityRole(entityID string, role string) error {
131146
132147// AddEntityKeyword - Add a possible value into the list of values for the keyword entity.
133148//
134- // https://wit.ai/docs/http/20200513/ #post__entities__entity_keywords_link
149+ // https://wit.ai/docs/http/#post__entities__entity_keywords_link
135150func (c * Client ) AddEntityKeyword (entityID string , keyword EntityKeyword ) (* Entity , error ) {
136151 valueJSON , err := json .Marshal (keyword )
137152 if err != nil {
@@ -156,7 +171,7 @@ func (c *Client) AddEntityKeyword(entityID string, keyword EntityKeyword) (*Enti
156171
157172// DeleteEntityKeyword - Delete a keyword from the keywords entity.
158173//
159- // https://wit.ai/docs/http/20200513/ #delete__entities__entity_keywords__keyword_link
174+ // https://wit.ai/docs/http/#delete__entities__entity_keywords__keyword_link
160175func (c * Client ) DeleteEntityKeyword (entityID string , keyword string ) error {
161176 resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s/keywords/%s" , url .PathEscape (entityID ), url .PathEscape (keyword )), "application/json" , nil )
162177 if err == nil {
@@ -168,7 +183,7 @@ func (c *Client) DeleteEntityKeyword(entityID string, keyword string) error {
168183
169184// AddEntityKeywordSynonym - Create a new synonym of the canonical value of the keywords entity.
170185//
171- // https://wit.ai/docs/http/20200513/ #post__entities__entity_keywords__keyword_synonyms_link
186+ // https://wit.ai/docs/http/#post__entities__entity_keywords__keyword_synonyms_link
172187func (c * Client ) AddEntityKeywordSynonym (entityID string , keyword string , synonym string ) (* Entity , error ) {
173188 type syn struct {
174189 Synonym string `json:"synonym"`
@@ -199,7 +214,7 @@ func (c *Client) AddEntityKeywordSynonym(entityID string, keyword string, synony
199214
200215// DeleteEntityKeywordSynonym - Delete a synonym of the keyword of the entity.
201216//
202- // https://wit.ai/docs/http/20200513/ #delete__entities__entity_keywords__keyword_synonyms__synonym_link
217+ // https://wit.ai/docs/http/#delete__entities__entity_keywords__keyword_synonyms__synonym_link
203218func (c * Client ) DeleteEntityKeywordSynonym (entityID string , keyword string , expression string ) error {
204219 resp , err := c .request (http .MethodDelete , fmt .Sprintf ("/entities/%s/keywords/%s/synonyms/%s" , url .PathEscape (entityID ), url .PathEscape (keyword ), url .PathEscape (expression )), "application/json" , nil )
205220 if err == nil {
0 commit comments