Skip to content

Commit bf55bd2

Browse files
author
aws-sdk-cpp-automation
committed
New Time Expression feature, part of DetectEntitiesV2 API will provide temporal relations to existing NERe entities such as Medication, Test, Treatment, Procedure and Medical conditions.
Introducing Amazon CloudWatch Composite Alarms
1 parent 345d3a6 commit bf55bd2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4071
-425
lines changed

aws-cpp-sdk-comprehendmedical/include/aws/comprehendmedical/ComprehendMedicalClient.h

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,15 @@ namespace Model
225225
/**
226226
* <p>Inspects the clinical text for a variety of medical entities and returns
227227
* specific information about them such as entity category, location, and
228-
* confidence score on that information.</p> <p>The <code>DetectEntitiesV2</code>
229-
* operation replaces the <a>DetectEntities</a> operation. This new action uses a
230-
* different model for determining the entities in your medical text and changes
231-
* the way that some entities are returned in the output. You should use the
232-
* <code>DetectEntitiesV2</code> operation in all new applications.</p> <p>The
233-
* <code>DetectEntitiesV2</code> operation returns the <code>Acuity</code> and
234-
* <code>Direction</code> entities as attributes instead of types. </p><p><h3>See
235-
* Also:</h3> <a
228+
* confidence score on that information. Amazon Comprehend Medical only detects
229+
* medical entities in English language texts.</p> <p>The
230+
* <code>DetectEntitiesV2</code> operation replaces the <a>DetectEntities</a>
231+
* operation. This new action uses a different model for determining the entities
232+
* in your medical text and changes the way that some entities are returned in the
233+
* output. You should use the <code>DetectEntitiesV2</code> operation in all new
234+
* applications.</p> <p>The <code>DetectEntitiesV2</code> operation returns the
235+
* <code>Acuity</code> and <code>Direction</code> entities as attributes instead of
236+
* types. </p><p><h3>See Also:</h3> <a
236237
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectEntitiesV2">AWS
237238
* API Reference</a></p>
238239
*/
@@ -241,14 +242,15 @@ namespace Model
241242
/**
242243
* <p>Inspects the clinical text for a variety of medical entities and returns
243244
* specific information about them such as entity category, location, and
244-
* confidence score on that information.</p> <p>The <code>DetectEntitiesV2</code>
245-
* operation replaces the <a>DetectEntities</a> operation. This new action uses a
246-
* different model for determining the entities in your medical text and changes
247-
* the way that some entities are returned in the output. You should use the
248-
* <code>DetectEntitiesV2</code> operation in all new applications.</p> <p>The
249-
* <code>DetectEntitiesV2</code> operation returns the <code>Acuity</code> and
250-
* <code>Direction</code> entities as attributes instead of types. </p><p><h3>See
251-
* Also:</h3> <a
245+
* confidence score on that information. Amazon Comprehend Medical only detects
246+
* medical entities in English language texts.</p> <p>The
247+
* <code>DetectEntitiesV2</code> operation replaces the <a>DetectEntities</a>
248+
* operation. This new action uses a different model for determining the entities
249+
* in your medical text and changes the way that some entities are returned in the
250+
* output. You should use the <code>DetectEntitiesV2</code> operation in all new
251+
* applications.</p> <p>The <code>DetectEntitiesV2</code> operation returns the
252+
* <code>Acuity</code> and <code>Direction</code> entities as attributes instead of
253+
* types. </p><p><h3>See Also:</h3> <a
252254
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectEntitiesV2">AWS
253255
* API Reference</a></p>
254256
*
@@ -259,14 +261,15 @@ namespace Model
259261
/**
260262
* <p>Inspects the clinical text for a variety of medical entities and returns
261263
* specific information about them such as entity category, location, and
262-
* confidence score on that information.</p> <p>The <code>DetectEntitiesV2</code>
263-
* operation replaces the <a>DetectEntities</a> operation. This new action uses a
264-
* different model for determining the entities in your medical text and changes
265-
* the way that some entities are returned in the output. You should use the
266-
* <code>DetectEntitiesV2</code> operation in all new applications.</p> <p>The
267-
* <code>DetectEntitiesV2</code> operation returns the <code>Acuity</code> and
268-
* <code>Direction</code> entities as attributes instead of types. </p><p><h3>See
269-
* Also:</h3> <a
264+
* confidence score on that information. Amazon Comprehend Medical only detects
265+
* medical entities in English language texts.</p> <p>The
266+
* <code>DetectEntitiesV2</code> operation replaces the <a>DetectEntities</a>
267+
* operation. This new action uses a different model for determining the entities
268+
* in your medical text and changes the way that some entities are returned in the
269+
* output. You should use the <code>DetectEntitiesV2</code> operation in all new
270+
* applications.</p> <p>The <code>DetectEntitiesV2</code> operation returns the
271+
* <code>Acuity</code> and <code>Direction</code> entities as attributes instead of
272+
* types. </p><p><h3>See Also:</h3> <a
270273
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectEntitiesV2">AWS
271274
* API Reference</a></p>
272275
*
@@ -276,17 +279,19 @@ namespace Model
276279

277280
/**
278281
* <p> Inspects the clinical text for protected health information (PHI) entities
279-
* and entity category, location, and confidence score on that
280-
* information.</p><p><h3>See Also:</h3> <a
282+
* and returns the entity category, location, and confidence score for each entity.
283+
* Amazon Comprehend Medical only detects entities in English language
284+
* texts.</p><p><h3>See Also:</h3> <a
281285
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectPHI">AWS
282286
* API Reference</a></p>
283287
*/
284288
virtual Model::DetectPHIOutcome DetectPHI(const Model::DetectPHIRequest& request) const;
285289

286290
/**
287291
* <p> Inspects the clinical text for protected health information (PHI) entities
288-
* and entity category, location, and confidence score on that
289-
* information.</p><p><h3>See Also:</h3> <a
292+
* and returns the entity category, location, and confidence score for each entity.
293+
* Amazon Comprehend Medical only detects entities in English language
294+
* texts.</p><p><h3>See Also:</h3> <a
290295
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectPHI">AWS
291296
* API Reference</a></p>
292297
*
@@ -296,8 +301,9 @@ namespace Model
296301

297302
/**
298303
* <p> Inspects the clinical text for protected health information (PHI) entities
299-
* and entity category, location, and confidence score on that
300-
* information.</p><p><h3>See Also:</h3> <a
304+
* and returns the entity category, location, and confidence score for each entity.
305+
* Amazon Comprehend Medical only detects entities in English language
306+
* texts.</p><p><h3>See Also:</h3> <a
301307
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/DetectPHI">AWS
302308
* API Reference</a></p>
303309
*
@@ -308,7 +314,8 @@ namespace Model
308314
/**
309315
* <p>InferICD10CM detects medical conditions as entities listed in a patient
310316
* record and links those entities to normalized concept identifiers in the
311-
* ICD-10-CM knowledge base from the Centers for Disease Control.</p><p><h3>See
317+
* ICD-10-CM knowledge base from the Centers for Disease Control. Amazon Comprehend
318+
* Medical only detects medical entities in English language texts.</p><p><h3>See
312319
* Also:</h3> <a
313320
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferICD10CM">AWS
314321
* API Reference</a></p>
@@ -318,7 +325,8 @@ namespace Model
318325
/**
319326
* <p>InferICD10CM detects medical conditions as entities listed in a patient
320327
* record and links those entities to normalized concept identifiers in the
321-
* ICD-10-CM knowledge base from the Centers for Disease Control.</p><p><h3>See
328+
* ICD-10-CM knowledge base from the Centers for Disease Control. Amazon Comprehend
329+
* Medical only detects medical entities in English language texts.</p><p><h3>See
322330
* Also:</h3> <a
323331
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferICD10CM">AWS
324332
* API Reference</a></p>
@@ -330,7 +338,8 @@ namespace Model
330338
/**
331339
* <p>InferICD10CM detects medical conditions as entities listed in a patient
332340
* record and links those entities to normalized concept identifiers in the
333-
* ICD-10-CM knowledge base from the Centers for Disease Control.</p><p><h3>See
341+
* ICD-10-CM knowledge base from the Centers for Disease Control. Amazon Comprehend
342+
* Medical only detects medical entities in English language texts.</p><p><h3>See
334343
* Also:</h3> <a
335344
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferICD10CM">AWS
336345
* API Reference</a></p>
@@ -342,7 +351,8 @@ namespace Model
342351
/**
343352
* <p>InferRxNorm detects medications as entities listed in a patient record and
344353
* links to the normalized concept identifiers in the RxNorm database from the
345-
* National Library of Medicine.</p><p><h3>See Also:</h3> <a
354+
* National Library of Medicine. Amazon Comprehend Medical only detects medical
355+
* entities in English language texts.</p><p><h3>See Also:</h3> <a
346356
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferRxNorm">AWS
347357
* API Reference</a></p>
348358
*/
@@ -351,7 +361,8 @@ namespace Model
351361
/**
352362
* <p>InferRxNorm detects medications as entities listed in a patient record and
353363
* links to the normalized concept identifiers in the RxNorm database from the
354-
* National Library of Medicine.</p><p><h3>See Also:</h3> <a
364+
* National Library of Medicine. Amazon Comprehend Medical only detects medical
365+
* entities in English language texts.</p><p><h3>See Also:</h3> <a
355366
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferRxNorm">AWS
356367
* API Reference</a></p>
357368
*
@@ -362,7 +373,8 @@ namespace Model
362373
/**
363374
* <p>InferRxNorm detects medications as entities listed in a patient record and
364375
* links to the normalized concept identifiers in the RxNorm database from the
365-
* National Library of Medicine.</p><p><h3>See Also:</h3> <a
376+
* National Library of Medicine. Amazon Comprehend Medical only detects medical
377+
* entities in English language texts.</p><p><h3>See Also:</h3> <a
366378
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InferRxNorm">AWS
367379
* API Reference</a></p>
368380
*

aws-cpp-sdk-comprehendmedical/include/aws/comprehendmedical/model/Attribute.h

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#pragma once
1717
#include <aws/comprehendmedical/ComprehendMedical_EXPORTS.h>
1818
#include <aws/comprehendmedical/model/EntitySubType.h>
19+
#include <aws/comprehendmedical/model/RelationshipType.h>
1920
#include <aws/core/utils/memory/stl/AWSString.h>
21+
#include <aws/comprehendmedical/model/EntityType.h>
2022
#include <aws/core/utils/memory/stl/AWSVector.h>
2123
#include <aws/comprehendmedical/model/Trait.h>
2224
#include <utility>
@@ -135,6 +137,49 @@ namespace Model
135137
inline Attribute& WithRelationshipScore(double value) { SetRelationshipScore(value); return *this;}
136138

137139

140+
/**
141+
* <p>The type of relationship between the entity and attribute. Type for the
142+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
143+
* same time as the <code>Date_Expression</code>. </p>
144+
*/
145+
inline const RelationshipType& GetRelationshipType() const{ return m_relationshipType; }
146+
147+
/**
148+
* <p>The type of relationship between the entity and attribute. Type for the
149+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
150+
* same time as the <code>Date_Expression</code>. </p>
151+
*/
152+
inline bool RelationshipTypeHasBeenSet() const { return m_relationshipTypeHasBeenSet; }
153+
154+
/**
155+
* <p>The type of relationship between the entity and attribute. Type for the
156+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
157+
* same time as the <code>Date_Expression</code>. </p>
158+
*/
159+
inline void SetRelationshipType(const RelationshipType& value) { m_relationshipTypeHasBeenSet = true; m_relationshipType = value; }
160+
161+
/**
162+
* <p>The type of relationship between the entity and attribute. Type for the
163+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
164+
* same time as the <code>Date_Expression</code>. </p>
165+
*/
166+
inline void SetRelationshipType(RelationshipType&& value) { m_relationshipTypeHasBeenSet = true; m_relationshipType = std::move(value); }
167+
168+
/**
169+
* <p>The type of relationship between the entity and attribute. Type for the
170+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
171+
* same time as the <code>Date_Expression</code>. </p>
172+
*/
173+
inline Attribute& WithRelationshipType(const RelationshipType& value) { SetRelationshipType(value); return *this;}
174+
175+
/**
176+
* <p>The type of relationship between the entity and attribute. Type for the
177+
* relationship is <code>OVERLAP</code>, indicating that the entity occurred at the
178+
* same time as the <code>Date_Expression</code>. </p>
179+
*/
180+
inline Attribute& WithRelationshipType(RelationshipType&& value) { SetRelationshipType(std::move(value)); return *this;}
181+
182+
138183
/**
139184
* <p> The numeric identifier for this attribute. This is a monotonically
140185
* increasing id unique within this response rather than a global unique
@@ -255,6 +300,37 @@ namespace Model
255300
inline Attribute& WithText(const char* value) { SetText(value); return *this;}
256301

257302

303+
/**
304+
* <p> The category of attribute. </p>
305+
*/
306+
inline const EntityType& GetCategory() const{ return m_category; }
307+
308+
/**
309+
* <p> The category of attribute. </p>
310+
*/
311+
inline bool CategoryHasBeenSet() const { return m_categoryHasBeenSet; }
312+
313+
/**
314+
* <p> The category of attribute. </p>
315+
*/
316+
inline void SetCategory(const EntityType& value) { m_categoryHasBeenSet = true; m_category = value; }
317+
318+
/**
319+
* <p> The category of attribute. </p>
320+
*/
321+
inline void SetCategory(EntityType&& value) { m_categoryHasBeenSet = true; m_category = std::move(value); }
322+
323+
/**
324+
* <p> The category of attribute. </p>
325+
*/
326+
inline Attribute& WithCategory(const EntityType& value) { SetCategory(value); return *this;}
327+
328+
/**
329+
* <p> The category of attribute. </p>
330+
*/
331+
inline Attribute& WithCategory(EntityType&& value) { SetCategory(std::move(value)); return *this;}
332+
333+
258334
/**
259335
* <p> Contextual information for this attribute. </p>
260336
*/
@@ -306,6 +382,9 @@ namespace Model
306382
double m_relationshipScore;
307383
bool m_relationshipScoreHasBeenSet;
308384

385+
RelationshipType m_relationshipType;
386+
bool m_relationshipTypeHasBeenSet;
387+
309388
int m_id;
310389
bool m_idHasBeenSet;
311390

@@ -318,6 +397,9 @@ namespace Model
318397
Aws::String m_text;
319398
bool m_textHasBeenSet;
320399

400+
EntityType m_category;
401+
bool m_categoryHasBeenSet;
402+
321403
Aws::Vector<Trait> m_traits;
322404
bool m_traitsHasBeenSet;
323405
};

aws-cpp-sdk-comprehendmedical/include/aws/comprehendmedical/model/EntitySubType.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,13 @@ namespace Model
5353
SYSTEM_ORGAN_SITE,
5454
DIRECTION,
5555
QUALITY,
56-
QUANTITY
56+
QUANTITY,
57+
TIME_EXPRESSION,
58+
TIME_TO_MEDICATION_NAME,
59+
TIME_TO_DX_NAME,
60+
TIME_TO_TEST_NAME,
61+
TIME_TO_PROCEDURE_NAME,
62+
TIME_TO_TREATMENT_NAME
5763
};
5864

5965
namespace EntitySubTypeMapper

aws-cpp-sdk-comprehendmedical/include/aws/comprehendmedical/model/EntityType.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ namespace Model
3030
MEDICAL_CONDITION,
3131
PROTECTED_HEALTH_INFORMATION,
3232
TEST_TREATMENT_PROCEDURE,
33-
ANATOMY
33+
ANATOMY,
34+
TIME_EXPRESSION
3435
};
3536

3637
namespace EntityTypeMapper

aws-cpp-sdk-comprehendmedical/include/aws/comprehendmedical/model/InputDataConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace Model
3434
{
3535

3636
/**
37-
* <p>The input properties for an entities detection job</p><p><h3>See Also:</h3>
37+
* <p>The input properties for an entities detection job.</p><p><h3>See Also:</h3>
3838
* <a
3939
* href="http://docs.aws.amazon.com/goto/WebAPI/comprehendmedical-2018-10-30/InputDataConfig">AWS
4040
* API Reference</a></p>
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
#pragma once
17+
#include <aws/comprehendmedical/ComprehendMedical_EXPORTS.h>
18+
#include <aws/core/utils/memory/stl/AWSString.h>
19+
20+
namespace Aws
21+
{
22+
namespace ComprehendMedical
23+
{
24+
namespace Model
25+
{
26+
enum class RelationshipType
27+
{
28+
NOT_SET,
29+
EVERY,
30+
WITH_DOSAGE,
31+
ADMINISTERED_VIA,
32+
FOR,
33+
NEGATIVE,
34+
OVERLAP,
35+
DOSAGE,
36+
ROUTE_OR_MODE,
37+
FORM,
38+
FREQUENCY,
39+
DURATION,
40+
STRENGTH,
41+
RATE,
42+
ACUITY,
43+
TEST_VALUE,
44+
TEST_UNITS,
45+
DIRECTION
46+
};
47+
48+
namespace RelationshipTypeMapper
49+
{
50+
AWS_COMPREHENDMEDICAL_API RelationshipType GetRelationshipTypeForName(const Aws::String& name);
51+
52+
AWS_COMPREHENDMEDICAL_API Aws::String GetNameForRelationshipType(RelationshipType value);
53+
} // namespace RelationshipTypeMapper
54+
} // namespace Model
55+
} // namespace ComprehendMedical
56+
} // namespace Aws

0 commit comments

Comments
 (0)