Make enhanced the default for us_street_api (#78)

Author: RyanLCox1

smartystreets_python_sdk/us_street/client.py

@@ -58,10 +58,16 @@ def remap_keys(obj):
     for lookup in obj:
         converted_lookup = {}
 
-        if (lookup.match == MatchType.ENHANCED or lookup.match == "enhanced") and lookup.candidates == 0:
-            add_field(converted_lookup, 'candidates', 5)
-        else:
+        # Determine effective match strategy (default to ENHANCED if not specified)
+        match_strategy = lookup.match
+        if match_strategy is None:
+            match_strategy = MatchType.ENHANCED
+
+        # Handle candidates
+        if lookup.candidates > 0:
             add_field(converted_lookup, 'candidates', lookup.candidates)
+        elif match_strategy == MatchType.ENHANCED or match_strategy == "enhanced":
+            add_field(converted_lookup, 'candidates', 5)
 
         add_field(converted_lookup, 'input_id', lookup.input_id)
         add_field(converted_lookup, 'street', lookup.street)
@@ -74,10 +80,13 @@ def remap_keys(obj):
         add_field(converted_lookup, 'addressee', lookup.addressee)
         add_field(converted_lookup, 'urbanization', lookup.urbanization)
         add_field(converted_lookup, 'county_source', lookup.county_source)
-        if isinstance(lookup.match, MatchType):
-            add_field(converted_lookup, 'match', lookup.match.value)
-        else:
-            add_field(converted_lookup, 'match', lookup.match)
+
+        # Only send match parameter if not STRICT
+        if match_strategy != MatchType.STRICT and match_strategy != "strict":
+            if isinstance(match_strategy, MatchType):
+                add_field(converted_lookup, 'match', match_strategy.value)
+            else:
+                add_field(converted_lookup, 'match', match_strategy)
 
         if isinstance(lookup.outputformat, OutputFormat):
             add_field(converted_lookup, 'format', lookup.outputformat.value)

smartystreets_python_sdk/us_street/lookup.py

@@ -4,7 +4,7 @@
 
 class Lookup:
     def __init__(self, street=None, street2=None, secondary=None, city=None, state=None, zipcode=None, lastline=None,
-                 addressee=None, urbanization=None, match=MatchType.STRICT, candidates=0, input_id=None,
+                 addressee=None, urbanization=None, match=None, candidates=0, input_id=None,
                  outputformat=OutputFormat.DEFAULT, county_source=None):
         """
         In addition to holding all input data for this lookup, this class also will contain the result

test/us_street/client_test.py

@@ -312,3 +312,39 @@ def test_full_json_response_deserialization(self):
         self.assertEqual(actual_candidate.analysis.components.urbanization.status, "unconfirmed")
         self.assertIsNone(actual_candidate.analysis.components.urbanization.change)
 
+    def test_default_match_strategy_is_enhanced(self):
+        sender = RequestCapturingSender()
+        serializer = FakeDeserializer({})
+        client = Client(sender, serializer)
+        lookup = Lookup()
+
+        client.send_lookup(lookup)
+
+        self.assertEqual('enhanced', sender.request.parameters['match'])
+        self.assertEqual(5, sender.request.parameters['candidates'])
+
+    def test_explicit_match_strict(self):
+        sender = RequestCapturingSender()
+        serializer = FakeDeserializer({})
+        client = Client(sender, serializer)
+        lookup = Lookup()
+        lookup.match = MatchType.STRICT
+
+        client.send_lookup(lookup)
+
+        self.assertNotIn('match', sender.request.parameters)
+        self.assertNotIn('candidates', sender.request.parameters)
+
+    def test_explicit_match_strict_with_candidates(self):
+        sender = RequestCapturingSender()
+        serializer = FakeDeserializer({})
+        client = Client(sender, serializer)
+        lookup = Lookup()
+        lookup.match = MatchType.STRICT
+        lookup.candidates = 3
+
+        client.send_lookup(lookup)
+
+        self.assertNotIn('match', sender.request.parameters)
+        self.assertEqual(3, sender.request.parameters['candidates'])
+