Skip to content

armgit / laya

Public Imported from GitHub
0

Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.

fix(dotnet): match French device footers with normal spacing

sameedkhan177dbf3ef22cee
diff --git a/laya-dotnet/src/Laya/LayaEmail.cs b/laya-dotnet/src/Laya/LayaEmail.cs
index a1b7f3d3..568dedf0 100644
--- a/laya-dotnet/src/Laya/LayaEmail.cs
+++ b/laya-dotnet/src/Laya/LayaEmail.cs
@@ -56,7 +56,7 @@ public static partial class LayaEmail
private const string Device = @"iphone|ipad|android|ios|mobile|celular|telemóvel|móvil|galaxy|smartphone|samsung|tablet|outlook|yahoo|mail|e-?mail|gmail|windows";
[GeneratedRegex(@"^\s*((enviad[oa] (do|pelo|pela|via|desde|a partir do)( meu| minha| mi)?|sent from( my)?|"
- + @"envoy[ée] (depuis|de) (mon |ma |mes )?)"
+ + @"envoy[ée] (depuis|de)( mon| ma| mes)?)"
+ @" (" + Device + @")( (" + Device + @"|para|for|no|na|\d+|phone|device|pro|max|mini|plus|using [a-z][a-z0-9_.+-]*))*"
+ @"|(obter o|get) outlook (para|for) (ios|android))[\s.!]*$", RegexOptions.IgnoreCase)]
private static partial Regex SignatureSentFromMobile();
diff --git a/laya-dotnet/tests/Laya.Tests/LayaEmailTests.cs b/laya-dotnet/tests/Laya.Tests/LayaEmailTests.cs
index ed891e38..263f5040 100644
--- a/laya-dotnet/tests/Laya.Tests/LayaEmailTests.cs
+++ b/laya-dotnet/tests/Laya.Tests/LayaEmailTests.cs
@@ -65,6 +65,28 @@ public sealed class LayaEmailTests
Assert.Equal("Hi team,\nCan you confirm the refund?",
LayaEmail.CleanBody("Hi team,\nCan you confirm the refund?\nRegards,\nAlice"));
+ // ── French device footers (regression: only matched with two spaces before the device) ──
+
+ [Theory]
+ [InlineData("Envoyé depuis mon iPhone")]
+ [InlineData("Envoyé de mon iPad.")]
+ [InlineData("Envoyé depuis iPhone")]
+ [InlineData("Envoyé de iPad")]
+ [InlineData("Envoyé depuis Outlook")]
+ [InlineData("ENVOYÉ DEPUIS MON IPHONE")]
+ public void FrenchDeviceFooterIsCut(string footer) =>
+ Assert.Equal("Merci de rembourser la facture.",
+ LayaEmail.CleanBody("Merci de rembourser la facture.\n\n" + footer));
+
+ [Theory]
+ [InlineData("Envoyé depuis mon iPhone par erreur.")]
+ [InlineData("Envoyé de mon iPad hier.")]
+ public void FrenchDeviceSentenceIsKept(string sentence)
+ {
+ var body = $"Bonjour,\n{sentence}\nMerci de rembourser la facture.";
+ Assert.Equal(body, LayaEmail.CleanBody(body));
+ }
+
[Fact]
public void EmptyBodyStaysEmpty() => Assert.Equal("", LayaEmail.CleanBody(""));
diff --git a/laya-dotnet/tests/Laya.Tests/golden/routing/email_probe.json b/laya-dotnet/tests/Laya.Tests/golden/routing/email_probe.json
index feb69962..adbee5ab 100644
--- a/laya-dotnet/tests/Laya.Tests/golden/routing/email_probe.json
+++ b/laya-dotnet/tests/Laya.Tests/golden/routing/email_probe.json
@@ -114,6 +114,30 @@
"max_chars": 3000,
"result": "Je demande un remboursement."
},
+ {
+ "label": "upstream/french_device_footer",
+ "body": "Merci de rembourser la facture.\n\nEnvoyé depuis mon iPhone",
+ "max_chars": 3000,
+ "result": "Merci de rembourser la facture."
+ },
+ {
+ "label": "upstream/french_device_footer_de_mon",
+ "body": "Merci de rembourser la facture.\n\nEnvoyé de mon iPad.",
+ "max_chars": 3000,
+ "result": "Merci de rembourser la facture."
+ },
+ {
+ "label": "upstream/french_device_footer_no_possessive",
+ "body": "Merci de rembourser la facture.\n\nEnvoyé depuis Outlook",
+ "max_chars": 3000,
+ "result": "Merci de rembourser la facture."
+ },
+ {
+ "label": "upstream/french_device_mention_prose",
+ "body": "Bonjour,\nEnvoyé depuis mon iPhone par erreur.\nMerci de rembourser la facture.",
+ "max_chars": 3000,
+ "result": "Bonjour,\nEnvoyé depuis mon iPhone par erreur.\nMerci de rembourser la facture."
+ },
{
"label": "inline_footer_no_blank_line",
"body": "My account is locked.\nThis email is confidential and intended solely for the named addressee.\nPlease unlock it.",
diff --git a/laya-dotnet/tests/Laya.Tests/golden/routing/meta.json b/laya-dotnet/tests/Laya.Tests/golden/routing/meta.json
index f21f9724..1a350b06 100644
--- a/laya-dotnet/tests/Laya.Tests/golden/routing/meta.json
+++ b/laya-dotnet/tests/Laya.Tests/golden/routing/meta.json
@@ -9,7 +9,7 @@
"counts": {
"lang_probe": 154,
"route_probe": 74,
- "email_probe_clean": 66,
+ "email_probe_clean": 70,
"email_probe_state": 8,
"shortlist_probe": 22,
"hashing_embedder_probe": 22
diff --git a/laya-dotnet/tools/routing_cases.py b/laya-dotnet/tools/routing_cases.py
index 1644b7be..14fab542 100644
--- a/laya-dotnet/tools/routing_cases.py
+++ b/laya-dotnet/tools/routing_cases.py
@@ -397,6 +397,11 @@ EMAIL_CLEAN_CASES = [
("upstream/device_mention_prose", "Please refund it.\nSent from my iPhone yesterday to support.", 3000),
("upstream/french_disclaimer",
"Je demande un remboursement.\n\nCe message est confidentiel et réservé au destinataire.", 3000),
+ ("upstream/french_device_footer", "Merci de rembourser la facture.\n\nEnvoyé depuis mon iPhone", 3000),
+ ("upstream/french_device_footer_de_mon", "Merci de rembourser la facture.\n\nEnvoyé de mon iPad.", 3000),
+ ("upstream/french_device_footer_no_possessive", "Merci de rembourser la facture.\n\nEnvoyé depuis Outlook", 3000),
+ ("upstream/french_device_mention_prose",
+ "Bonjour,\nEnvoyé depuis mon iPhone par erreur.\nMerci de rembourser la facture.", 3000),
# ---- straight from tests/test_email.py ----
("inline_footer_no_blank_line", "My account is locked.\n%s\nPlease unlock it." % _DISCLAIMER_TEXT, 3000),
("inline_footer_no_terminal_punctuation", "My account is locked\n%s\nPlease unlock it." % _DISCLAIMER_TEXT, 3000),